Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-17 18:07:02 +00:00
Code Issues Projects Releases Wiki Activity

ZSANITIZEM: The 2 maybe issues due to -fsanitize=memory were

Browse Source 
also false positives so surround with ZSANITIZEM conditional
gif.c: some code fiddling (remove unnecessary braces)
output.c: out_colour_char_to_rgb: take unsigned char
general: some casts
This commit is contained in:
gitlost
2025-02-19 17:51:23 +00:00
parent c7cf006e71
commit 888b4b5684
7 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -104,7 +104,7 @@ if(ZINT_SANITIZE)
message(STATUS "ZINT_SANITIZE: ignoring for MSVC < 2019") message(STATUS "ZINT_SANITIZE: ignoring for MSVC < 2019")
endif() endif()
else() else()
set(SANITIZERS address undefined) set(SANITIZERS address undefined leak)
foreach(sanitizer IN ITEMS ${SANITIZERS}) foreach(sanitizer IN ITEMS ${SANITIZERS})
set(CMAKE_REQUIRED_LIBRARIES -fsanitize=${sanitizer}) set(CMAKE_REQUIRED_LIBRARIES -fsanitize=${sanitizer})
check_c_compiler_flag(-fsanitize=${sanitizer} C_COMPILER_FLAG_FSANITIZE_${sanitizer}) check_c_compiler_flag(-fsanitize=${sanitizer} C_COMPILER_FLAG_FSANITIZE_${sanitizer})

4
backend/bmp.c
View File

@@ -69,12 +69,12 @@ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pix
if (memcmp(&palette[i], &fg, sizeof(fg)) == 0) { if (memcmp(&palette[i], &fg, sizeof(fg)) == 0) {
ultra_fg_index = i + 1; ultra_fg_index = i + 1;
} }
map[ultra_chars[i]] = i + 1; map[ultra_chars[i]] = (unsigned char) (i + 1);
} }
bits_per_pixel = 4; bits_per_pixel = 4;
colour_count = ultra_fg_index == 9 ? 10 : 9; colour_count = ultra_fg_index == 9 ? 10 : 9;
map['0'] = 0; map['0'] = 0;
map['1'] = ultra_fg_index; map['1'] = (unsigned char) ultra_fg_index;
} else { } else {
bits_per_pixel = 1; bits_per_pixel = 1;
colour_count = 2; colour_count = 2;

2
backend/emf.c
View File

@@ -367,7 +367,7 @@ INTERNAL int emf_plot(struct zint_symbol *symbol, int rotate_angle) {
recordcount++; recordcount++;
if (symbol->symbology == BARCODE_ULTRA) { if (symbol->symbology == BARCODE_ULTRA) {
static const char ultra_chars[] = { '0', 'C', 'B', 'M', 'R', 'Y', 'G', 'K', 'W' }; static const unsigned char ultra_chars[9] = { '0', 'C', 'B', 'M', 'R', 'Y', 'G', 'K', 'W' };
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
out_le_u32(emr_createbrushindirect_colour[i].type, 0x00000027); /* EMR_CREATEBRUSHINDIRECT */ out_le_u32(emr_createbrushindirect_colour[i].type, 0x00000027); /* EMR_CREATEBRUSHINDIRECT */
out_le_u32(emr_createbrushindirect_colour[i].size, 24); out_le_u32(emr_createbrushindirect_colour[i].size, 24);

89
backend/gif.c
View File

@@ -59,7 +59,7 @@ struct gif_state {
}; };
static void gif_BufferNextByte(struct gif_state *pState) { static void gif_BufferNextByte(struct gif_state *pState) {
(pState->OutPosCur)++; pState->OutPosCur++;
if (pState->fOutPaged && pState->OutPosCur + 2 >= pState->OutLength) { if (pState->fOutPaged && pState->OutPosCur + 2 >= pState->OutLength) {
/* Keep last 256 bytes so `OutByteCountPos` within range */ /* Keep last 256 bytes so `OutByteCountPos` within range */
fm_write(pState->pOut, 1, pState->OutPosCur - 256, pState->fmp); fm_write(pState->pOut, 1, pState->OutPosCur - 256, pState->fmp);
@@ -75,25 +75,25 @@ static void gif_BufferNextByte(struct gif_state *pState) {
* of the last one is set to 255. * of the last one is set to 255.
* */ * */
if (pState->fByteCountByteSet && (pState->OutByteCountPos + 256 == pState->OutPosCur)) { if (pState->fByteCountByteSet && (pState->OutByteCountPos + 256 == pState->OutPosCur)) {
(pState->pOut)[pState->OutByteCountPos] = 255; pState->pOut[pState->OutByteCountPos] = 255;
pState->OutByteCountPos = pState->OutPosCur; pState->OutByteCountPos = pState->OutPosCur;
(pState->OutPosCur)++; pState->OutPosCur++;
} }
(pState->pOut)[pState->OutPosCur] = 0x00; pState->pOut[pState->OutPosCur] = 0x00;
} }
static void gif_AddCodeToBuffer(struct gif_state *pState, unsigned short CodeIn, unsigned char CodeBits) { static void gif_AddCodeToBuffer(struct gif_state *pState, unsigned short CodeIn, unsigned char CodeBits) {
/* Check, if we may fill up the current byte completely */ /* Check, if we may fill up the current byte completely */
if (CodeBits >= pState->OutBitsFree) { if (CodeBits >= pState->OutBitsFree) {
(pState->pOut)[pState->OutPosCur] |= (unsigned char) (CodeIn << (8 - pState->OutBitsFree)); pState->pOut[pState->OutPosCur] |= (unsigned char) (CodeIn << (8 - pState->OutBitsFree));
gif_BufferNextByte(pState); gif_BufferNextByte(pState);
CodeIn = (unsigned short) (CodeIn >> pState->OutBitsFree); CodeIn = (unsigned short) (CodeIn >> pState->OutBitsFree);
CodeBits -= pState->OutBitsFree; CodeBits -= pState->OutBitsFree;
pState->OutBitsFree = 8; pState->OutBitsFree = 8;
/* Write a full byte if there are at least 8 code bits left */ /* Write a full byte if there are at least 8 code bits left */
if (CodeBits >= pState->OutBitsFree) { if (CodeBits >= pState->OutBitsFree) {
(pState->pOut)[pState->OutPosCur] = (unsigned char) CodeIn; pState->pOut[pState->OutPosCur] = (unsigned char) CodeIn;
gif_BufferNextByte(pState); gif_BufferNextByte(pState);
CodeIn = (unsigned short) (CodeIn >> 8); CodeIn = (unsigned short) (CodeIn >> 8);
CodeBits -= 8; CodeBits -= 8;
@@ -101,7 +101,7 @@ static void gif_AddCodeToBuffer(struct gif_state *pState, unsigned short CodeIn,
} }
/* The remaining bits of CodeIn fit in the current byte. */ /* The remaining bits of CodeIn fit in the current byte. */
if (CodeBits > 0) { if (CodeBits > 0) {
(pState->pOut)[pState->OutPosCur] |= (unsigned char) (CodeIn << (8 - pState->OutBitsFree)); pState->pOut[pState->OutPosCur] |= (unsigned char) (CodeIn << (8 - pState->OutBitsFree));
pState->OutBitsFree -= CodeBits; pState->OutBitsFree -= CodeBits;
} }
} }
@@ -109,18 +109,18 @@ static void gif_AddCodeToBuffer(struct gif_state *pState, unsigned short CodeIn,
static void gif_FlushStringTable(struct gif_state *pState) { static void gif_FlushStringTable(struct gif_state *pState) {
unsigned short Pos; unsigned short Pos;
for (Pos = 0; Pos < pState->ClearCode; Pos++) { for (Pos = 0; Pos < pState->ClearCode; Pos++) {
(pState->NodeAxon)[Pos] = 0; pState->NodeAxon[Pos] = 0;
} }
} }
static unsigned short gif_FindPixelOutlet(struct gif_state *pState, unsigned short HeadNode, unsigned char Byte) { static unsigned short gif_FindPixelOutlet(struct gif_state *pState, unsigned short HeadNode, unsigned char Byte) {
unsigned short Outlet; unsigned short Outlet;
Outlet = (pState->NodeAxon)[HeadNode]; Outlet = pState->NodeAxon[HeadNode];
while (Outlet) { while (Outlet) {
if ((pState->NodePix)[Outlet] == Byte) if (pState->NodePix[Outlet] == Byte)
return Outlet; return Outlet;
Outlet = (pState->NodeNext)[Outlet]; Outlet = pState->NodeNext[Outlet];
} }
return 0; return 0;
} }
@@ -128,7 +128,7 @@ static unsigned short gif_FindPixelOutlet(struct gif_state *pState, unsigned sho
static int gif_NextCode(struct gif_state *pState, unsigned char *pPixelValueCur, unsigned char CodeBits) { static int gif_NextCode(struct gif_state *pState, unsigned char *pPixelValueCur, unsigned char CodeBits) {
unsigned short UpNode; unsigned short UpNode;
unsigned short DownNode; unsigned short DownNode;
/* start with the root node for last pixel chain */ /* Start with the root node for last pixel chain */
UpNode = *pPixelValueCur; UpNode = *pPixelValueCur;
if (pState->pIn == pState->pInEnd) { if (pState->pIn == pState->pInEnd) {
gif_AddCodeToBuffer(pState, UpNode, CodeBits); gif_AddCodeToBuffer(pState, UpNode, CodeBits);
@@ -148,22 +148,22 @@ static int gif_NextCode(struct gif_state *pState, unsigned char *pPixelValueCur,
gif_AddCodeToBuffer(pState, UpNode, CodeBits); gif_AddCodeToBuffer(pState, UpNode, CodeBits);
/* ... and extend the string by appending 'PixelValueCur' */ /* ... and extend the string by appending 'PixelValueCur' */
/* Create a successor node for 'PixelValueCur' whose code is 'freecode' */ /* Create a successor node for 'PixelValueCur' whose code is 'freecode' */
(pState->NodePix)[pState->FreeCode] = *pPixelValueCur; pState->NodePix[pState->FreeCode] = *pPixelValueCur;
(pState->NodeAxon)[pState->FreeCode] = (pState->NodeNext)[pState->FreeCode] = 0; pState->NodeAxon[pState->FreeCode] = pState->NodeNext[pState->FreeCode] = 0;
/* ...and link it to the end of the chain emanating from fg_axon[UpNode]. */ /* ...and link it to the end of the chain emanating from fg_axon[UpNode]. */
DownNode = (pState->NodeAxon)[UpNode]; DownNode = pState->NodeAxon[UpNode];
if (!DownNode) { if (!DownNode) {
(pState->NodeAxon)[UpNode] = pState->FreeCode; pState->NodeAxon[UpNode] = pState->FreeCode;
} else { } else {
while ((pState->NodeNext)[DownNode]) { while (pState->NodeNext[DownNode]) {
DownNode = (pState->NodeNext)[DownNode]; DownNode = pState->NodeNext[DownNode];
} }
(pState->NodeNext)[DownNode] = pState->FreeCode; pState->NodeNext[DownNode] = pState->FreeCode;
} }
return 1; return 1;
} }
static int gif_lzw(struct gif_state *pState, int paletteBitSize) { static int gif_lzw(struct gif_state *pState, unsigned char paletteBitSize) {
unsigned char PixelValueCur; unsigned char PixelValueCur;
unsigned char CodeBits; unsigned char CodeBits;
unsigned short Pos; unsigned short Pos;
@@ -179,7 +179,7 @@ static int gif_lzw(struct gif_state *pState, int paletteBitSize) {
if (paletteBitSize == 1) if (paletteBitSize == 1)
paletteBitSize = 2; paletteBitSize = 2;
/* initial size of compression codes */ /* Initial size of compression codes */
CodeBits = paletteBitSize + 1; CodeBits = paletteBitSize + 1;
pState->ClearCode = (1 << paletteBitSize); pState->ClearCode = (1 << paletteBitSize);
pState->FreeCode = pState->ClearCode + 2; pState->FreeCode = pState->ClearCode + 2;
@@ -188,12 +188,12 @@ static int gif_lzw(struct gif_state *pState, int paletteBitSize) {
pState->fByteCountByteSet = 0; pState->fByteCountByteSet = 0;
for (Pos = 0; Pos < pState->ClearCode; Pos++) for (Pos = 0; Pos < pState->ClearCode; Pos++)
(pState->NodePix)[Pos] = (unsigned char) Pos; pState->NodePix[Pos] = (unsigned char) Pos;
gif_FlushStringTable(pState); gif_FlushStringTable(pState);
/* Write what the GIF specification calls the "code size". */ /* Write what the GIF specification calls the "code size". */
(pState->pOut)[pState->OutPosCur] = paletteBitSize; pState->pOut[pState->OutPosCur] = paletteBitSize;
/* Reserve first bytecount byte */ /* Reserve first bytecount byte */
gif_BufferNextByte(pState); gif_BufferNextByte(pState);
pState->OutByteCountPos = pState->OutPosCur; pState->OutByteCountPos = pState->OutPosCur;
@@ -203,9 +203,9 @@ static int gif_lzw(struct gif_state *pState, int paletteBitSize) {
gif_AddCodeToBuffer(pState, pState->ClearCode, CodeBits); gif_AddCodeToBuffer(pState, pState->ClearCode, CodeBits);
for (;;) { for (;;) {
/* generate and save the next code, which may consist of multiple input pixels. */ /* Generate and save the next code, which may consist of multiple input pixels. */
if (!gif_NextCode(pState, &PixelValueCur, CodeBits)) { /* Check for end of data stream */ if (!gif_NextCode(pState, &PixelValueCur, CodeBits)) { /* Check for end of data stream */
/* submit 'eoi' as the last item of the code stream */ /* Submit 'eoi' as the last item of the code stream */
gif_AddCodeToBuffer(pState, (unsigned short) (pState->ClearCode + 1), CodeBits); gif_AddCodeToBuffer(pState, (unsigned short) (pState->ClearCode + 1), CodeBits);
pState->fByteCountByteSet = 0; pState->fByteCountByteSet = 0;
if (pState->OutBitsFree < 8) { if (pState->OutBitsFree < 8) {
@@ -213,7 +213,7 @@ static int gif_lzw(struct gif_state *pState, int paletteBitSize) {
} }
/* > Update last bytecount byte; */ /* > Update last bytecount byte; */
if (pState->OutByteCountPos < pState->OutPosCur) { if (pState->OutByteCountPos < pState->OutPosCur) {
(pState->pOut)[pState->OutByteCountPos] pState->pOut[pState->OutByteCountPos]
= (unsigned char) (pState->OutPosCur - pState->OutByteCountPos - 1); = (unsigned char) (pState->OutPosCur - pState->OutByteCountPos - 1);
} }
pState->OutPosCur++; pState->OutPosCur++;
@@ -228,7 +228,7 @@ static int gif_lzw(struct gif_state *pState, int paletteBitSize) {
gif_FlushStringTable(pState); gif_FlushStringTable(pState);
gif_AddCodeToBuffer(pState, pState->ClearCode, CodeBits); gif_AddCodeToBuffer(pState, pState->ClearCode, CodeBits);
CodeBits = (unsigned char) (1 + paletteBitSize); CodeBits = 1 + paletteBitSize;
pState->FreeCode = (unsigned short) (pState->ClearCode + 2); pState->FreeCode = (unsigned short) (pState->ClearCode + 2);
} }
} }
@@ -242,7 +242,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
unsigned char outbuf[10]; unsigned char outbuf[10];
unsigned char paletteRGB[10][3]; unsigned char paletteRGB[10][3];
int paletteCount, i; int paletteCount, i;
int paletteBitSize; unsigned char paletteBitSize;
int paletteSize; int paletteSize;
struct gif_state State; struct gif_state State;
int transparent_index; int transparent_index;
@@ -259,7 +259,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
(void) out_colour_get_rgb(symbol->fgcolour, &RGBfg[0], &RGBfg[1], &RGBfg[2], &fgalpha); (void) out_colour_get_rgb(symbol->fgcolour, &RGBfg[0], &RGBfg[1], &RGBfg[2], &fgalpha);
(void) out_colour_get_rgb(symbol->bgcolour, &RGBbg[0], &RGBbg[1], &RGBbg[2], &bgalpha); (void) out_colour_get_rgb(symbol->bgcolour, &RGBbg[0], &RGBbg[1], &RGBbg[2], &bgalpha);
/* prepare state array */ /* Prepare state array */
State.pIn = pixelbuf; State.pIn = pixelbuf;
State.pInEnd = pixelbuf + bitmapSize; State.pInEnd = pixelbuf + bitmapSize;
/* Allow for overhead of 4 == code size + byte count + overflow byte + zero terminator */ /* Allow for overhead of 4 == code size + byte count + overflow byte + zero terminator */
@@ -268,9 +268,12 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
if (State.fOutPaged) { if (State.fOutPaged) {
State.OutLength = GIF_LZW_PAGE_SIZE; State.OutLength = GIF_LZW_PAGE_SIZE;
} }
if (!(State.pOut = (unsigned char *) calloc(1, State.OutLength))) { if (!(State.pOut = (unsigned char *) malloc(State.OutLength))) {
return errtxt(ZINT_ERROR_MEMORY, symbol, 614, "Insufficient memory for GIF LZW buffer"); return errtxt(ZINT_ERROR_MEMORY, symbol, 614, "Insufficient memory for GIF LZW buffer");
} }
#ifdef ZINT_SANITIZEM /* Suppress clang -fsanitize=memory false positive */
memset(State.pOut, 0, State.OutLength);
#endif
State.fmp = &fm; State.fmp = &fm;
@@ -301,7 +304,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
if (symbol->symbology == BARCODE_ULTRA) { if (symbol->symbology == BARCODE_ULTRA) {
static const unsigned char ultra_chars[8] = { 'W', 'C', 'B', 'M', 'R', 'Y', 'G', 'K' }; static const unsigned char ultra_chars[8] = { 'W', 'C', 'B', 'M', 'R', 'Y', 'G', 'K' };
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
State.map[ultra_chars[i]] = i; State.map[ultra_chars[i]] = (unsigned char) i;
out_colour_char_to_rgb(ultra_chars[i], &paletteRGB[i][0], &paletteRGB[i][1], &paletteRGB[i][2]); out_colour_char_to_rgb(ultra_chars[i], &paletteRGB[i][0], &paletteRGB[i][1], &paletteRGB[i][2]);
} }
paletteCount = 8; paletteCount = 8;
@@ -311,9 +314,9 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
if (symbol->border_width > 0 && (symbol->output_options & (BARCODE_BIND | BARCODE_BOX | BARCODE_BIND_TOP))) { if (symbol->border_width > 0 && (symbol->output_options & (BARCODE_BIND | BARCODE_BOX | BARCODE_BIND_TOP))) {
/* Check whether can re-use black */ /* Check whether can re-use black */
if (RGBfg[0] == 0 && RGBfg[1] == 0 && RGBfg[2] == 0) { if (RGBfg[0] == 0 && RGBfg[1] == 0 && RGBfg[2] == 0) {
State.map['1'] = fgindex = 7; /* Re-use black */ State.map['1'] = (unsigned char) (fgindex = 7); /* Re-use black */
} else { } else {
State.map['1'] = fgindex = paletteCount; State.map['1'] = (unsigned char) (fgindex = paletteCount);
memcpy(paletteRGB[paletteCount++], RGBfg, 3); memcpy(paletteRGB[paletteCount++], RGBfg, 3);
paletteBitSize = 4; paletteBitSize = 4;
} }
@@ -325,17 +328,17 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
&& !(symbol->output_options & BARCODE_NO_QUIET_ZONES))) { && !(symbol->output_options & BARCODE_NO_QUIET_ZONES))) {
/* Check whether can re-use white */ /* Check whether can re-use white */
if (RGBbg[0] == 0xff && RGBbg[1] == 0xff && RGBbg[2] == 0xff && bgalpha == fgalpha) { if (RGBbg[0] == 0xff && RGBbg[1] == 0xff && RGBbg[2] == 0xff && bgalpha == fgalpha) {
State.map['0'] = bgindex = 0; /* Re-use white */ State.map['0'] = (unsigned char) (bgindex = 0); /* Re-use white */
} else { } else {
State.map['0'] = bgindex = paletteCount; State.map['0'] = (unsigned char) (bgindex = paletteCount);
memcpy(paletteRGB[paletteCount++], RGBbg, 3); memcpy(paletteRGB[paletteCount++], RGBbg, 3);
paletteBitSize = 4; paletteBitSize = 4;
} }
} }
} else { } else {
State.map['0'] = bgindex = 0; State.map['0'] = (unsigned char) (bgindex = 0);
memcpy(paletteRGB[bgindex], RGBbg, 3); memcpy(paletteRGB[bgindex], RGBbg, 3);
State.map['1'] = fgindex = 1; State.map['1'] = (unsigned char) (fgindex = 1);
memcpy(paletteRGB[fgindex], RGBfg, 3); memcpy(paletteRGB[fgindex], RGBfg, 3);
paletteCount = 2; paletteCount = 2;
paletteBitSize = 1; paletteBitSize = 1;
@@ -353,7 +356,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
transparent_index = fgindex; transparent_index = fgindex;
} }
/* palette size 2 ^ bit size */ /* Palette size is 2 ^ bit size */
paletteSize = 1 << paletteBitSize; paletteSize = 1 << paletteBitSize;
/* GIF signature (6) */ /* GIF signature (6) */
@@ -365,7 +368,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
/* Screen Height */ /* Screen Height */
outbuf[2] = (unsigned char) (0xff & symbol->bitmap_height); outbuf[2] = (unsigned char) (0xff & symbol->bitmap_height);
outbuf[3] = (unsigned char) (0xff & (symbol->bitmap_height >> 8)); outbuf[3] = (unsigned char) (0xff & (symbol->bitmap_height >> 8));
/* write ImageBits-1 to the three least significant bits of byte 5 of /* Write ImageBits-1 to the three least significant bits of byte 5 of
* the Screen Descriptor * the Screen Descriptor
* Bits 76543210 * Bits 76543210
* 1 : Global colour map * 1 : Global colour map
@@ -379,13 +382,13 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
* Background colour index * Background colour index
* Default to 0. If colour code 0 or K is present, it is used as index * Default to 0. If colour code 0 or K is present, it is used as index
*/ */
outbuf[5] = bgindex == -1 ? 0 : bgindex; outbuf[5] = (unsigned char) (bgindex == -1 ? 0 : bgindex);
/* Byte 7 must be 0x00 */ /* Byte 7 must be 0x00 */
outbuf[6] = 0x00; outbuf[6] = 0x00;
fm_write(outbuf, 1, 7, State.fmp); fm_write(outbuf, 1, 7, State.fmp);
/* Global Color Table (paletteSize*3) */ /* Global Color Table (paletteSize*3) */
fm_write(paletteRGB, 1, 3*paletteCount, State.fmp); fm_write(paletteRGB, 1, 3 * paletteCount, State.fmp);
/* add unused palette items to fill palette size */ /* Add unused palette items to fill palette size */
for (i = paletteCount; i < paletteSize; i++) { for (i = paletteCount; i < paletteSize; i++) {
fm_write(RGBUnused, 1, 3, State.fmp); fm_write(RGBUnused, 1, 3, State.fmp);
} }
@@ -440,7 +443,7 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
outbuf[9] = 0x00; outbuf[9] = 0x00;
fm_write(outbuf, 1, 10, State.fmp); fm_write(outbuf, 1, 10, State.fmp);
/* call lzw encoding */ /* Call lzw encoding */
if (!gif_lzw(&State, paletteBitSize)) { if (!gif_lzw(&State, paletteBitSize)) {
free(State.pOut); free(State.pOut);
(void) fm_close(State.fmp, symbol); (void) fm_close(State.fmp, symbol);

19
backend/output.c
View File

@@ -114,11 +114,11 @@ INTERNAL int out_colour_get_rgb(const char *colour, unsigned char *red, unsigned
int black, val; int black, val;
if ((comma1 = strchr(colour, ',')) == NULL) { if ((comma1 = strchr(colour, ',')) == NULL) {
*red = 16 * ctoi(colour[0]) + ctoi(colour[1]); *red = (unsigned char) (16 * ctoi(colour[0]) + ctoi(colour[1]));
*green = 16 * ctoi(colour[2]) + ctoi(colour[3]); *green = (unsigned char) (16 * ctoi(colour[2]) + ctoi(colour[3]));
*blue = 16 * ctoi(colour[4]) + ctoi(colour[5]); *blue = (unsigned char) (16 * ctoi(colour[4]) + ctoi(colour[5]));
if (alpha) { if (alpha) {
*alpha = colour[6] ? 16 * ctoi(colour[6]) + ctoi(colour[7]) : 0xFF; *alpha = (unsigned char) (colour[6] ? 16 * ctoi(colour[6]) + ctoi(colour[7]) : 0xFF);
return colour[6] ? 1 : 0; return colour[6] ? 1 : 0;
} }
return 0; return 0;
@@ -129,13 +129,13 @@ INTERNAL int out_colour_get_rgb(const char *colour, unsigned char *red, unsigned
black = 100 - to_int((const unsigned char *) (comma3 + 1), (int) strlen(comma3 + 1)); black = 100 - to_int((const unsigned char *) (comma3 + 1), (int) strlen(comma3 + 1));
val = 100 - to_int((const unsigned char *) colour, (int) (comma1 - colour)); /* Cyan */ val = 100 - to_int((const unsigned char *) colour, (int) (comma1 - colour)); /* Cyan */
*red = (int) round((0xFF * val * black) / 10000.0); *red = (unsigned char) round((0xFF * val * black) / 10000.0);
val = 100 - to_int((const unsigned char *) (comma1 + 1), (int) (comma2 - (comma1 + 1))); /* Magenta */ val = 100 - to_int((const unsigned char *) (comma1 + 1), (int) (comma2 - (comma1 + 1))); /* Magenta */
*green = (int) round((0xFF * val * black) / 10000.0); *green = (unsigned char) round((0xFF * val * black) / 10000.0);
val = 100 - to_int((const unsigned char *) (comma2 + 1), (int) (comma3 - (comma2 + 1))); /* Yellow */ val = 100 - to_int((const unsigned char *) (comma2 + 1), (int) (comma3 - (comma2 + 1))); /* Yellow */
*blue = (int) round((0xFF * val * black) / 10000.0); *blue = (unsigned char) round((0xFF * val * black) / 10000.0);
if (alpha) { if (alpha) {
*alpha = 0xFF; *alpha = 0xFF;
@@ -190,7 +190,8 @@ INTERNAL int out_colour_get_cmyk(const char *colour, int *cyan, int *magenta, in
} }
/* Convert internal colour chars "WCBMRYGK" to RGB */ /* Convert internal colour chars "WCBMRYGK" to RGB */
INTERNAL int out_colour_char_to_rgb(const char ch, unsigned char *red, unsigned char *green, unsigned char *blue) { INTERNAL int out_colour_char_to_rgb(const unsigned char ch, unsigned char *red, unsigned char *green,
unsigned char *blue) {
static const char chars[] = "WCBMRYGK"; static const char chars[] = "WCBMRYGK";
static const unsigned char colours[8][3] = { static const unsigned char colours[8][3] = {
{ 0xff, 0xff, 0xff, }, /* White */ { 0xff, 0xff, 0xff, }, /* White */
@@ -202,7 +203,7 @@ INTERNAL int out_colour_char_to_rgb(const char ch, unsigned char *red, unsigned
{ 0, 0xff, 0, }, /* Green */ { 0, 0xff, 0, }, /* Green */
{ 0, 0, 0, }, /* Black */ { 0, 0, 0, }, /* Black */
}; };
int i = posn(chars, ch); int i = posn(chars, (const char) ch);
int ret = i != -1; int ret = i != -1;
if (i == -1) { if (i == -1) {

5
backend/output.h
View File

@@ -1,7 +1,7 @@
/* output.h - Common routines for raster/vector */ /* output.h - Common routines for raster/vector */
/* /*
libzint - the open source barcode library libzint - the open source barcode library
Copyright (C) 2020-2024 Robin Stuart <rstuart114@gmail.com> Copyright (C) 2020-2025 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
@@ -50,7 +50,8 @@ INTERNAL int out_colour_get_cmyk(const char *colour, int *cyan, int *magenta, in
unsigned char *rgb_alpha); unsigned char *rgb_alpha);
/* Convert internal colour chars "WCBMRYGK" to RGB */ /* Convert internal colour chars "WCBMRYGK" to RGB */
INTERNAL int out_colour_char_to_rgb(const char ch, unsigned char *red, unsigned char *green, unsigned char *blue); INTERNAL int out_colour_char_to_rgb(const unsigned char ch, unsigned char *red, unsigned char *green,
unsigned char *blue);
/* Set left (x), top (y), right and bottom offsets for whitespace, also right quiet zone */ /* Set left (x), top (y), right and bottom offsets for whitespace, also right quiet zone */
INTERNAL void out_set_whitespace_offsets(const struct zint_symbol *symbol, const int hide_text, INTERNAL void out_set_whitespace_offsets(const struct zint_symbol *symbol, const int hide_text,

2
backend/raster.c
View File

@@ -185,7 +185,9 @@ static int save_raster_image_to_file(struct zint_symbol *symbol, const int image
if (!(rotated_pixbuf = (unsigned char *) raster_malloc((size_t) image_size, 0 /*prev_size*/))) { if (!(rotated_pixbuf = (unsigned char *) raster_malloc((size_t) image_size, 0 /*prev_size*/))) {
return errtxt(ZINT_ERROR_MEMORY, symbol, 650, "Insufficient memory for pixel buffer"); return errtxt(ZINT_ERROR_MEMORY, symbol, 650, "Insufficient memory for pixel buffer");
} }
#ifdef ZINT_SANITIZEM /* Suppress clang -fsanitize=memory false positive */
memset(rotated_pixbuf, DEFAULT_PAPER, image_size); memset(rotated_pixbuf, DEFAULT_PAPER, image_size);
#endif
} }
/* Rotate image before plotting */ /* Rotate image before plotting */