sjs/gh-BertoldVdb-ZoneDetect
1
0
Fork 0
mirror of https://github.com/BertoldVdb/ZoneDetect.git synced 2026-03-25 08:45:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #29 from wbarnard/memory-errors

Browse source 
Memory Allocation Error Handling
This commit is contained in:
Bertold Van den Bergh 2021-03-08 18:05:08 +01:00 committed by GitHub
commit a000827b9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
library/zonedetect.c
View file

@ -289,6 +289,10 @@ static int ZDParseHeader(ZoneDetect *library)
uint32_t index = UINT32_C(7);
library->fieldNames = malloc(library->numFields * sizeof *library->fieldNames);
if (!library->fieldNames) {
return -1;
}
size_t i;
for(i = 0; i < library->numFields; i++) {
library->fieldNames[i] = ZDParseString(library, &index);
@ -1026,8 +1030,48 @@ ZoneDetectResult *ZDLookup(const ZoneDetect *library, float lat, float lon, floa
size_t j;
for(j = 0; j < library->numFields; j++) {
results[i].data[j] = ZDParseString(library, &tmpIndex);
if (!results[i].data[j]) {
/* free all allocated memory */
size_t m;
for(m = 0; m < j; m++) {
if(results[i].data[m]) {
free(results[i].data[m]);
}
}
size_t k;
for(k = 0; k < i; k++) {
size_t l;
for(l = 0; l < (size_t)results[k].numFields; l++) {
if(results[k].data[l]) {
free(results[k].data[l]);
}
}
if (results[k].data) {
free(results[k].data);
}
}
free(results);
return NULL;
}
}
}
else {
/* free all allocated memory */
size_t k;
for(k = 0; k < i; k++) {
size_t l;
for(l = 0; l < (size_t)results[k].numFields; l++) {
if(results[k].data[l]) {
free(results[k].data[l]);
}
}
if (results[k].data) {
free(results[k].data);
}
}
free(results);
return NULL;
}
}
/* Write end marker */
@ -1192,10 +1236,12 @@ char* ZDHelperSimpleLookupString(const ZoneDetect* library, float lat, float lon
length += 1;
output = (char*)malloc(length);
output[0] = 0;
for(i=0; i<sizeof(strings)/sizeof(char*); i++) {
if(strings[i]) {
strcat(output + strlen(output), strings[i]);
if(output) {
output[0] = 0;
for(i=0; i<sizeof(strings)/sizeof(char*); i++) {
if(strings[i]) {
strcat(output + strlen(output), strings[i]);
}
}
}