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

Bugfix: Allocate sufficient memory for larger data strings

Browse Source
This commit is contained in:
Robin Stuart 2016-08-29 18:45:58 +01:00
parent 3cf8a142b8
commit f89167c30b
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/code128.c
View File

@ -481,7 +481,7 @@ int code_128(struct zint_symbol *symbol, unsigned char source[], int length) {
glyph_count = glyph_count + 1.0; glyph_count = glyph_count + 1.0;
} }
} }
if (glyph_count > 80.0) { if (glyph_count > 60.0) {
strcpy(symbol->errtxt, "Input too long"); strcpy(symbol->errtxt, "Input too long");
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }
@ -842,7 +842,7 @@ int ean_128(struct zint_symbol *symbol, unsigned char source[], int length) {
glyph_count = glyph_count + 1.0; glyph_count = glyph_count + 1.0;
} }
} }
if (glyph_count > 80.0) { if (glyph_count > 60.0) {
strcpy(symbol->errtxt, "Input too long"); strcpy(symbol->errtxt, "Input too long");
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }

17
backend/postal.c
View File

@ -332,7 +332,7 @@ char rm4scc(char source[], unsigned char dest[], int length) {
/* Puts RM4SCC into the data matrix */ /* Puts RM4SCC into the data matrix */
int royal_plot(struct zint_symbol *symbol, unsigned char source[], int length) { int royal_plot(struct zint_symbol *symbol, unsigned char source[], int length) {
char height_pattern[200]; char height_pattern[210];
unsigned int loopey, h; unsigned int loopey, h;
int writer; int writer;
int error_number; int error_number;
@ -340,7 +340,7 @@ int royal_plot(struct zint_symbol *symbol, unsigned char source[], int length) {
error_number = 0; error_number = 0;
if (length > 120) { if (length > 50) {
strcpy(symbol->errtxt, "Input too long"); strcpy(symbol->errtxt, "Input too long");
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }
@ -351,7 +351,7 @@ int royal_plot(struct zint_symbol *symbol, unsigned char source[], int length) {
return error_number; return error_number;
} }
/*check = */rm4scc((char*) source, (unsigned char*) height_pattern, length); /*check = */rm4scc((char*) source, (unsigned char*) height_pattern, length);
writer = 0; writer = 0;
h = strlen(height_pattern); h = strlen(height_pattern);
for (loopey = 0; loopey < h; loopey++) { for (loopey = 0; loopey < h; loopey++) {
@ -378,7 +378,7 @@ int royal_plot(struct zint_symbol *symbol, unsigned char source[], int length) {
The same as RM4SCC but without check digit The same as RM4SCC but without check digit
Specification at http://www.tntpost.nl/zakelijk/klantenservice/downloads/kIX_code/download.aspx */ Specification at http://www.tntpost.nl/zakelijk/klantenservice/downloads/kIX_code/download.aspx */
int kix_code(struct zint_symbol *symbol, unsigned char source[], int length) { int kix_code(struct zint_symbol *symbol, unsigned char source[], int length) {
char height_pattern[50], localstr[20]; char height_pattern[75], localstr[20];
unsigned int loopey; unsigned int loopey;
int writer, i, h; int writer, i, h;
int error_number; /* zeroes; */ int error_number; /* zeroes; */
@ -398,9 +398,9 @@ int kix_code(struct zint_symbol *symbol, unsigned char source[], int length) {
} }
strcpy(localstr, (char *) source); strcpy(localstr, (char *) source);
/* Encode data */ /* Encode data */
for (i = 0; i < 18; i++) { for (i = 0; i < length; i++) {
lookup(KRSET, RoyalTable, localstr[i], height_pattern); lookup(KRSET, RoyalTable, localstr[i], height_pattern);
} }
@ -522,6 +522,11 @@ int japan_post(struct zint_symbol *symbol, unsigned char source[], int length) {
char* local_source = (char*) _alloca(length + 1); char* local_source = (char*) _alloca(length + 1);
#endif #endif
if (length > 20) {
strcpy(symbol->errtxt, "Input too long");
return ZINT_ERROR_TOO_LONG;
}
inter_posn = 0; inter_posn = 0;
error_number = 0; error_number = 0;