Backups/dump1090
1
0
Fork 0
Code Actions Releases Wiki Activity

Fix json buffer reallocation issue

Browse Source 
Instead of try to guess if we will need more space for future inserions,
wait for exhaustion and allocate twice the required space. This is far from perfect
but works better. Now Json output works all the time.
This commit is contained in:
Rodrigo Osorio 2015-11-27 22:54:29 +01:00
parent 5656777bda
commit b6ecedbe2f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dump1090.c
View File

@ -2175,13 +2175,18 @@ char *aircraftsToJson(int *len) {
a->reg?a->reg->code:"", a->reg?a->reg->code:"",
a->flight, a->lat, a->lon, a->altitude, a->track, a->flight, a->lat, a->lon, a->altitude, a->track,
a->speed); a->speed);
p += l; buflen -= l;
/* Resize if needed. */ /* Resize if needed. */
if (buflen < 256) { if (l >= buflen) {
int used = p-buf; int used = p-buf;
buflen += 1024; /* Our increment. */ buflen += (2*l); /* Our increment. */
buf = realloc(buf,used+buflen); buf = realloc(buf,used+buflen);
p = buf+used; if (buf == NULL) exit(1);
p = buf+used;
/* try to add the current airplane again */
continue;
} else {
p += l; buflen -= l;
} }
} }
a = a->next; a = a->next;