mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

#181 auspost fix, check input immediately; test for EANX double + fix

Browse Source
This commit is contained in:
gitlost
2020-03-25 15:40:13 +00:00
parent ee291e45d6
commit c245a11da2
4 changed files with 130 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/auspost.c
View File

@ -110,7 +110,12 @@ INTERNAL int australia_post(struct zint_symbol *symbol, unsigned char source[],
char fcc[3] = {0, 0, 0}, dpid[10];
char localstr[30];
error_number = 0;
/* Check input immediately to catch nuls */
error_number = is_sane(GDSET, source, length);
if (error_number == ZINT_ERROR_INVALID_DATA) {
strcpy(symbol->errtxt, "404: Invalid characters in data");
return error_number;
}
strcpy(localstr, "");
/* Do all of the length checking first to avoid stack smashing */
@ -165,12 +170,6 @@ INTERNAL int australia_post(struct zint_symbol *symbol, unsigned char source[],
strcat(localstr, (char*) source);
h = strlen(localstr);
error_number = is_sane(GDSET, (unsigned char *) localstr, h);
if (error_number == ZINT_ERROR_INVALID_DATA) {
strcpy(symbol->errtxt, "404: Invalid characters in data");
return error_number;
}
/* Verifiy that the first 8 characters are numbers */
memcpy(dpid, localstr, 8);
dpid[8] = '\0';