openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-14 05:08:53 +00:00
Code Issues Projects Releases Wiki Activity

Update to libXdmcp 1.1.2

Browse Source
This commit is contained in:
matthieu
2015-04-06 13:43:52 +00:00
parent 593800b416
commit 2093a99a43
20 changed files with 4027 additions and 2192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
lib/libXdmcp/Array.c
View File

@@ -43,6 +43,15 @@ xmalloc(size_t size)
return malloc(size ? size : 1);
}
/*
* This variant of calloc does not return NULL if zero count is passed into.
*/
static void *
xcalloc(size_t n, size_t size)
{
return calloc(n ? n : 1, size);
}
/*
* This variant of realloc does not return NULL if zero size is passed into
*/
@@ -55,68 +64,73 @@ xrealloc(void *ptr, size_t size)
int
XdmcpAllocARRAY8 (ARRAY8Ptr array, int length)
{
CARD8Ptr newData;
/* length defined in ARRAY8 struct is a CARD16 (not CARD8 like the rest) */
if (length > UINT16_MAX)
return FALSE;
if ((length > UINT16_MAX) || (length < 0))
array->data = NULL;
else
array->data = xmalloc(length * sizeof (CARD8));
newData = (CARD8Ptr) xmalloc(length * sizeof (CARD8));
if (!newData)
if (array->data == NULL) {
array->length = 0;
return FALSE;
}
array->length = (CARD16) length;
array->data = newData;
return TRUE;
}
int
XdmcpAllocARRAY16 (ARRAY16Ptr array, int length)
{
CARD16Ptr newData;
/* length defined in ARRAY16 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
if ((length > UINT8_MAX) || (length < 0))
array->data = NULL;
else
array->data = xmalloc(length * sizeof (CARD16));
newData = (CARD16Ptr) xmalloc(length * sizeof (CARD16));
if (!newData)
if (array->data == NULL) {
array->length = 0;
return FALSE;
}
array->length = (CARD8) length;
array->data = newData;
return TRUE;
}
int
XdmcpAllocARRAY32 (ARRAY32Ptr array, int length)
{
CARD32Ptr newData;
/* length defined in ARRAY32 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
if ((length > UINT8_MAX) || (length < 0))
array->data = NULL;
else
array->data = xmalloc(length * sizeof (CARD32));
newData = (CARD32Ptr) xmalloc(length * sizeof (CARD32));
if (!newData)
if (array->data == NULL) {
array->length = 0;
return FALSE;
}
array->length = (CARD8) length;
array->data = newData;
return TRUE;
}
int
XdmcpAllocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length)
{
ARRAY8Ptr newData;
/* length defined in ARRAYofARRAY8 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
if ((length > UINT8_MAX) || (length < 0))
array->data = NULL;
else
/*
* Use calloc to ensure the pointers are cleared out so we
* don't try to free garbage if XdmcpDisposeARRAYofARRAY8()
* is called before the caller sets them to valid pointers.
*/
array->data = xcalloc(length, sizeof (ARRAY8));
newData = (ARRAY8Ptr) xmalloc(length * sizeof (ARRAY8));
if (!newData)
if (array->data == NULL) {
array->length = 0;
return FALSE;
}
array->length = (CARD8) length;
array->data = newData;
return TRUE;
}
@@ -133,9 +147,7 @@ XdmcpARRAY8Equal (const ARRAY8Ptr array1, const ARRAY8Ptr array2)
int
XdmcpCopyARRAY8 (const ARRAY8Ptr src, ARRAY8Ptr dst)
{
dst->length = src->length;
dst->data = (CARD8 *) xmalloc(dst->length * sizeof (CARD8));
if (!dst->data)
if (!XdmcpAllocARRAY8(dst, src->length))
return FALSE;
memmove (dst->data, src->data, src->length * sizeof (CARD8));
return TRUE;
@@ -147,7 +159,7 @@ XdmcpReallocARRAY8 (ARRAY8Ptr array, int length)
CARD8Ptr newData;
/* length defined in ARRAY8 struct is a CARD16 (not CARD8 like the rest) */
if (length > UINT16_MAX)
if ((length > UINT16_MAX) || (length < 0))
return FALSE;
newData = (CARD8Ptr) xrealloc(array->data, length * sizeof (CARD8));
@@ -164,12 +176,15 @@ XdmcpReallocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length)
ARRAY8Ptr newData;
/* length defined in ARRAYofARRAY8 struct is a CARD8 */
if (length > UINT8_MAX)
if ((length > UINT8_MAX) || (length < 0))
return FALSE;
newData = (ARRAY8Ptr) xrealloc(array->data, length * sizeof (ARRAY8));
if (!newData)
return FALSE;
if (length > array->length)
memset(newData + array->length, 0,
(length - array->length) * sizeof (ARRAY8));
array->length = (CARD8) length;
array->data = newData;
return TRUE;
@@ -181,7 +196,7 @@ XdmcpReallocARRAY16 (ARRAY16Ptr array, int length)
CARD16Ptr newData;
/* length defined in ARRAY16 struct is a CARD8 */
if (length > UINT8_MAX)
if ((length > UINT8_MAX) || (length < 0))
return FALSE;
newData = (CARD16Ptr) xrealloc(array->data, length * sizeof (CARD16));
if (!newData)
@@ -197,7 +212,7 @@ XdmcpReallocARRAY32 (ARRAY32Ptr array, int length)
CARD32Ptr newData;
/* length defined in ARRAY32 struct is a CARD8 */
if (length > UINT8_MAX)
if ((length > UINT8_MAX) || (length < 0))
return FALSE;
newData = (CARD32Ptr) xrealloc(array->data, length * sizeof (CARD32));