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 OSS-Fuzz CODABLOCKF fix, allow for full control chars range in GetPossibleCharacterSet

Browse Source
This commit is contained in:
gitlost 2020-03-25 19:27:34 +00:00
parent c245a11da2
commit 556dea1f88
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
backend/codablock.c
View File

@ -96,7 +96,7 @@ typedef struct sCharacterSetTable
*/ */
static int GetPossibleCharacterSet(unsigned char C) static int GetPossibleCharacterSet(unsigned char C)
{ {
if (C<='\x19') /* Dec:31 */ if (C<='\x1f') /* Control chars */
return CodeA; return CodeA;
if (C>='0' && C<='9') if (C>='0' && C<='9')
return ZTNum; /* ZTNum=CodeA+CodeB+CodeC */ return ZTNum; /* ZTNum=CodeA+CodeB+CodeC */
@ -206,7 +206,7 @@ static int RemainingDigits(CharacterSetTable *T, int charCur,int emptyColumns)
* Return value Resulting row count * Return value Resulting row count
*/ */
static int Columns2Rows(CharacterSetTable *T, unsigned char *data, const size_t dataLength, static int Columns2Rows(struct zint_symbol *symbol, CharacterSetTable *T, unsigned char *data, const size_t dataLength,
int * pRows, int * pUseColumns, int * pSet, int * pFillings) int * pRows, int * pUseColumns, int * pSet, int * pFillings)
{ {
int useColumns; /* Usable Characters per line */ int useColumns; /* Usable Characters per line */
@ -419,9 +419,9 @@ static int Columns2Rows(CharacterSetTable *T, unsigned char *data, const size_t
} }
} }
} while(rowsCur>44); } while(rowsCur>44);
#ifdef _DEBUG if (symbol->debug & ZINT_DEBUG_PRINT) {
printf(" -> out: rowsCur <%i>, useColumns <%i>, fillings <%i>\n",rowsCur,useColumns,fillings); printf(" -> out: rowsCur <%i>, useColumns <%i>, fillings <%i>\n",rowsCur,useColumns,fillings);
#endif }
*pUseColumns=useColumns; *pUseColumns=useColumns;
*pRows=rowsCur; *pRows=rowsCur;
*pFillings=fillings; *pFillings=fillings;
@ -429,7 +429,7 @@ static int Columns2Rows(CharacterSetTable *T, unsigned char *data, const size_t
} }
/* Find columns if row count is given. /* Find columns if row count is given.
*/ */
static int Rows2Columns(CharacterSetTable *T, unsigned char *data, const size_t dataLength, static int Rows2Columns(struct zint_symbol *symbol, CharacterSetTable *T, unsigned char *data, const size_t dataLength,
int * pRows, int * pUseColumns, int * pSet, int * pFillings) int * pRows, int * pUseColumns, int * pSet, int * pFillings)
{ {
int rowsCur; int rowsCur;
@ -451,9 +451,9 @@ static int Rows2Columns(CharacterSetTable *T, unsigned char *data, const size_t
rowsRequested=*pRows; rowsRequested=*pRows;
#ifdef _DEBUG if (symbol->debug & ZINT_DEBUG_PRINT) {
fprintf(stderr,"Optimizer : Searching <%i> rows\n",rowsRequested); fprintf(stderr,"Optimizer : Searching <%i> rows\n",rowsRequested);
#endif }
if (rowsRequested==1) if (rowsRequested==1)
/* OneLiners are self-calibrating */ /* OneLiners are self-calibrating */
@ -472,7 +472,7 @@ static int Rows2Columns(CharacterSetTable *T, unsigned char *data, const size_t
pTestList[testListSize] = testColumns; pTestList[testListSize] = testColumns;
testListSize++; testListSize++;
useColumns=testColumns; /* Make a copy because it may be modified */ useColumns=testColumns; /* Make a copy because it may be modified */
errorCur = Columns2Rows(T, data, dataLength, &rowsCur, &useColumns, pSet, &fillings); errorCur = Columns2Rows(symbol, T, data, dataLength, &rowsCur, &useColumns, pSet, &fillings);
if (errorCur != 0) if (errorCur != 0)
return errorCur; return errorCur;
if (rowsCur<=rowsRequested) { if (rowsCur<=rowsRequested) {
@ -707,21 +707,22 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
} else { } else {
/* use 1/1 aspect/ratio Codablock */ /* use 1/1 aspect/ratio Codablock */
columns = ((int)floor(sqrt(1.0*dataLength))+5); columns = ((int)floor(sqrt(1.0*dataLength))+5);
if (columns > 64) if (columns > 64) {
columns = 64; columns = 64;
#ifdef _DEBUG }
if (symbol->debug & ZINT_DEBUG_PRINT) {
printf("Auto column count for %zu characters:%d\n",dataLength,columns); printf("Auto column count for %zu characters:%d\n",dataLength,columns);
#endif }
} }
} }
/* There are 5 Codewords for Organisation Start(2),row(1),CheckSum,Stop */ /* There are 5 Codewords for Organisation Start(2),row(1),CheckSum,Stop */
useColumns = columns - 5; useColumns = columns - 5;
if ( rows > 0 ) { if ( rows > 0 ) {
/* row count given */ /* row count given */
Error=Rows2Columns(T,data,dataLength,&rows,&useColumns,pSet,&fillings); Error = Rows2Columns(symbol, T, data, dataLength, &rows, &useColumns, pSet, &fillings);
} else { } else {
/* column count given */ /* column count given */
Error=Columns2Rows(T,data,dataLength,&rows,&useColumns,pSet,&fillings); Error = Columns2Rows(symbol, T, data, dataLength, &rows, &useColumns, pSet, &fillings);
} }
if (Error != 0) { if (Error != 0) {
strcpy(symbol->errtxt, "413: Data string to long"); strcpy(symbol->errtxt, "413: Data string to long");
@ -738,8 +739,7 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
} }
} }
#ifdef _DEBUG if (symbol->debug & ZINT_DEBUG_PRINT) { /* start a new level of local variables */
{ /* start a new level of local variables */
int DPos; int DPos;
printf("\nData:"); printf("\nData:");
for (DPos=0 ; DPos< dataLength ; DPos++) for (DPos=0 ; DPos< dataLength ; DPos++)
@ -768,7 +768,6 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
fputc((pSet[DPos]&CFill)==0?'.':'X',stdout); fputc((pSet[DPos]&CFill)==0?'.':'X',stdout);
fputc('\n',stdout); fputc('\n',stdout);
} }
#endif
columns = useColumns + 5; columns = useColumns + 5;
@ -968,7 +967,7 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
pOutPos++; pOutPos++;
} /* End Lineloop */ } /* End Lineloop */
#ifdef _DEBUG if (symbol->debug & ZINT_DEBUG_PRINT) {
/* Dump the output to the screen /* Dump the output to the screen
*/ */
printf("\nCode 128 Code Numbers:\n"); printf("\nCode 128 Code Numbers:\n");
@ -984,7 +983,7 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
} }
} }
printf("rows=%i columns=%i fillings=%i\n", rows, columns, fillings); printf("rows=%i columns=%i fillings=%i\n", rows, columns, fillings);
#endif }
/* Paint the C128 patterns */ /* Paint the C128 patterns */
for (r = 0; r < rows; r++) { for (r = 0; r < rows; r++) {

1
backend/tests/CMakeLists.txt
View File

@ -52,6 +52,7 @@ endmacro(zint_add_test)
zint_add_test(auspost, test_auspost) zint_add_test(auspost, test_auspost)
zint_add_test(channel, test_channel) zint_add_test(channel, test_channel)
zint_add_test(codablock, test_codablock)
zint_add_test(common, test_common) zint_add_test(common, test_common)
zint_add_test(composite, test_composite) zint_add_test(composite, test_composite)
zint_add_test(dmatrix, test_dmatrix) zint_add_test(dmatrix, test_dmatrix)