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

Force unlatch from EDIFACT on illegal character

Browse Source 
Bug report and patch by brunt, ticket #44
This commit is contained in:
Robin Stuart 2016-11-26 09:00:41 +00:00
parent 1155683be1
commit dc36261030
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/dmatrix.c
View File

@ -867,7 +867,7 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
/* step (f) EDIFACT encodation */ /* step (f) EDIFACT encodation */
if (current_mode == DM_EDIFACT) { if (current_mode == DM_EDIFACT) {
int value = 0; int value = -1;
next_mode = DM_EDIFACT; next_mode = DM_EDIFACT;
if (*process_p == 3) { if (*process_p == 3) {
@ -885,11 +885,21 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
if ((source[sp] >= ' ') && (source[sp] <= '?')) { if ((source[sp] >= ' ') && (source[sp] <= '?')) {
value = source[sp]; value = source[sp];
} }
/* possibility put an assertion here for invalid character (none of the ifs trigger) */ if (value != -1) {
process_buffer[*process_p] = value;
(*process_p)++;
sp++;
} else {
// Invalid character, latch to ASCII
process_buffer[*process_p] = 31;
(*process_p)++;
process_buffer[*process_p] = value; while (*process_p < 4) {
(*process_p)++; process_buffer[*process_p] = 0;
sp++; (*process_p)++;
}
next_mode = DM_ASCII;
}
} }
if (*process_p >= 4) { if (*process_p >= 4) {