tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #156 from rinigus/master_cstring

Browse Source 
cstring_array_from_char_array returns NULL for empty char array
This commit is contained in:
Al Barrentine
2017-01-14 13:04:16 -05:00
committed by GitHub
parent df89387b5c 67624f89d0
commit 904fde6b9b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/string_utils.c
View File

@@ -710,18 +710,21 @@ cstring_array *cstring_array_new_size(size_t size) {
}
cstring_array *cstring_array_from_char_array(char_array *str) {
if (str == NULL) return NULL;
if (str->n == 0)
return cstring_array_new();
cstring_array *array = malloc(sizeof(cstring_array));
if (array == NULL || str == NULL) return NULL;
if (array == NULL) return NULL;
array->str = str;
array->indices = uint32_array_new_size(1);
uint32_array_push(array->indices, 0);
char *ptr = str->a;
if (str->n > 0) {
for (uint32_t i = 0; i < str->n - 1; i++, ptr++) {
if (*ptr == '\0') {
uint32_array_push(array->indices, i + 1);
}
for (uint32_t i = 0; i < str->n - 1; i++, ptr++) {
if (*ptr == '\0') {
uint32_array_push(array->indices, i + 1);
}
}
return array;