Attachment 308680 Details for Bug 450518 – oo1.1 backported patch from caolan

[patch] oo1.1 backported patch from caolan

workspace.mhu18-backport-1.1.X.patch (text/plain), 1.64 KB, created by Mark J. Cox on 2008-06-09 11:54:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark J. Cox

Created: 2008-06-09 11:54:46 UTC

Size: 1.64 KB

patch

obsolete

>--- OOO_1_1_2/sal/rtl/source/alloc.c.orig	2008-06-09 06:28:37.286539000 -0400
>+++ OOO_1_1_2/sal/rtl/source/alloc.c	2008-06-09 06:37:06.709342000 -0400
>@@ -1101,6 +1101,7 @@
> #endif /* OSL_DEBUG_LEVEL || PRODUCT */
> 
> #define RTL_MEMORY_ENQUEUE(m) __rtl_memory_enqueue((m))
>+#define SAL_MAX_SIZE ((sal_uInt32) 0xFFFFFFFF)
> 
> /*===========================================================================
>  *
>@@ -1116,6 +1117,12 @@
> 	memory_type * memory;
> 	if (!(!p || !n))
> 	{
>+                if (n >= SAL_MAX_SIZE - (__Q__ + __C__ - 1))
>+                {
>+                        /* requested size too large for roundup alignment */
>+                        return 0;
>+                }
>+
> 		/* reallocate */
> 		register size_t datlen;
> 
>@@ -1230,6 +1237,12 @@
> 	}
> 	else if (!p)
> 	{
>+                if (n >= SAL_MAX_SIZE - (__Q__ + __C__ - 1))
>+                {
>+                        /* requested size too large for roundup alignment */
>+                        return 0;
>+                }
>+
> 		/* allocate */
> 		memory = 0;
> 		n = RTL_MEMORY_ALIGN(n, __Q__) + __C__;
>@@ -1283,6 +1296,12 @@
> 	void * p = 0;
> 	if (n > 0)
> 	{
>+                if (n >= SAL_MAX_SIZE - (__Q__ + __C__ - 1))
>+                {
>+                        /* requested size too large for roundup alignment */
>+                        return 0;
>+                }
>+
> 		memory_type * memory = 0;
> 		n = RTL_MEMORY_ALIGN(n, __Q__) + __C__;
> 
>@@ -1348,6 +1367,12 @@
> 	void * p = 0;
> 	if (n > 0)
> 	{
>+		if (n >= SAL_MAX_SIZE - (__Q__ + __C__ - 1))
>+		{
>+			/* requested size too large for roundup alignment */
>+			return 0;
>+		}
>+
> 		memory_type * memory = 0;
> 		n = RTL_MEMORY_ALIGN(n, __Q__) + __C__;
>

Actions: View | Diff

Attachments on bug 450518: 308679 | 308680