DeforaOS/libSystem
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error handling

Browse Source
This commit is contained in:
Pierre Pronchery 2018-02-19 12:49:44 +01:00
parent 1834ff6975
commit 9cf0b5b6de
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/array.c
View File

@ -104,7 +104,7 @@ int array_get_copy(Array * array, size_t pos, void * value)
uint64_t offset; uint64_t offset;
if(pos >= array->count) if(pos >= array->count)
return 1; return error_set_code(-ERANGE, "%s", strerror(ERANGE));
offset = pos * array->size; offset = pos * array->size;
memcpy(value, &array->value[offset], array->size); memcpy(value, &array->value[offset], array->size);
return 0; return 0;
@ -121,16 +121,16 @@ int array_set(Array * array, size_t pos, void * value)
/* check for overflows */ /* check for overflows */
if(pos >= UINT32_MAX) if(pos >= UINT32_MAX)
return -error_set_code(1, "%s", strerror(ERANGE)); return error_set_code(-ERANGE, "%s", strerror(ERANGE));
offset = pos * array->size; offset = pos * array->size;
if(array->count < p) if(array->count < p)
{ {
/* grow the array */ /* grow the array */
if(UINT64_MAX - offset < array->size if(UINT64_MAX - offset < array->size
|| offset + array->size > SIZE_MAX) || offset + array->size > SIZE_MAX)
return -error_set_code(-ERANGE, "%s", strerror(ERANGE)); return error_set_code(-ERANGE, "%s", strerror(ERANGE));
if((q = realloc(array->value, offset + array->size)) == NULL) if((q = realloc(array->value, offset + array->size)) == NULL)
return -error_set_code(-errno, "%s", strerror(errno)); return error_set_code(-errno, "%s", strerror(errno));
array->value = q; array->value = q;
curpos = array->count * array->size; curpos = array->count * array->size;
memset(&array->value[curpos], 0, offset - curpos); memset(&array->value[curpos], 0, offset - curpos);
@ -152,7 +152,7 @@ int array_append(Array * array, void * value)
/* check for overflows */ /* check for overflows */
if(UINT64_MAX - offset < array->size if(UINT64_MAX - offset < array->size
|| offset + array->size > SIZE_MAX) || offset + array->size > SIZE_MAX)
return -error_set_code(-ERANGE, "%s", strerror(ERANGE)); return error_set_code(-ERANGE, "%s", strerror(ERANGE));
if((p = realloc(array->value, offset + array->size)) == NULL) if((p = realloc(array->value, offset + array->size)) == NULL)
return error_set_code(-errno, "%s", strerror(errno)); return error_set_code(-errno, "%s", strerror(errno));
array->value = p; array->value = p;
@ -168,7 +168,7 @@ int array_remove_pos(Array * array, size_t pos)
char * p; char * p;
if(pos >= array->count) if(pos >= array->count)
return -error_set_code(-ERANGE, "%s", strerror(ERANGE)); return error_set_code(-ERANGE, "%s", strerror(ERANGE));
array->count--; array->count--;
memmove(&array->value[pos * array->size], memmove(&array->value[pos * array->size],
&array->value[(pos + 1) * array->size], &array->value[(pos + 1) * array->size],