AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #40 from wiedehopf/overflow_fix

Browse source 
Overflow fix
This commit is contained in:
Eric Tran 2019-04-09 08:52:11 -05:00 committed by GitHub
parent 883399cee3 82c5ff6724
commit d54c452683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net_io.c
View file

@ -1550,7 +1550,7 @@ char *generateStatsJson(const char *url_path, int *len) {
p = appendStatsJson(p, end, &add, "total"); p = appendStatsJson(p, end, &add, "total");
p = safe_snprintf(p, end, "\n}\n"); p = safe_snprintf(p, end, "\n}\n");
assert(p <= end); assert(p < end);
*len = p-buf; *len = p-buf;
return buf; return buf;
@ -1878,7 +1878,7 @@ __attribute__ ((format (printf,4,5))) static char *appendFATSV(char *p, char *en
return p; return p;
} }
#define TSV_MAX_PACKET_SIZE 600 #define TSV_MAX_PACKET_SIZE 800
#define TSV_VERSION "4E" #define TSV_VERSION "4E"
static void writeFATSVPositionUpdate(float lat, float lon, float alt) static void writeFATSVPositionUpdate(float lat, float lon, float alt)
@ -1908,7 +1908,7 @@ static void writeFATSVPositionUpdate(float lat, float lon, float alt)
--p; // remove last tab --p; // remove last tab
p = safe_snprintf(p, end, "\n"); p = safe_snprintf(p, end, "\n");
if (p <= end) if (p < end)
completeWrite(&Modes.fatsv_out, p); completeWrite(&Modes.fatsv_out, p);
else else
fprintf(stderr, "fatsv: output too large (max %d, overran by %d)\n", TSV_MAX_PACKET_SIZE, (int) (p - end)); fprintf(stderr, "fatsv: output too large (max %d, overran by %d)\n", TSV_MAX_PACKET_SIZE, (int) (p - end));
@ -1935,7 +1935,7 @@ static void writeFATSVEventMessage(struct modesMessage *mm, const char *datafiel
} }
p = safe_snprintf(p, end, "\n"); p = safe_snprintf(p, end, "\n");
if (p <= end) if (p < end)
completeWrite(&Modes.fatsv_out, p); completeWrite(&Modes.fatsv_out, p);
else else
fprintf(stderr, "fatsv: output too large (max %d, overran by %d)\n", TSV_MAX_PACKET_SIZE, (int) (p - end)); fprintf(stderr, "fatsv: output too large (max %d, overran by %d)\n", TSV_MAX_PACKET_SIZE, (int) (p - end));
@ -2256,7 +2256,7 @@ static void writeFATSV()
--p; // remove last tab --p; // remove last tab
p = safe_snprintf(p, end, "\n"); p = safe_snprintf(p, end, "\n");
if (p <= end) if (p < end)
completeWrite(&Modes.fatsv_out, p); completeWrite(&Modes.fatsv_out, p);
else else
fprintf(stderr, "fatsv: output too large (max %d, overran by %d)\n", TSV_MAX_PACKET_SIZE, (int) (p - end)); fprintf(stderr, "fatsv: output too large (max %d, overran by %d)\n", TSV_MAX_PACKET_SIZE, (int) (p - end));