Skip to content

qrenc: silence gcc -Wstringop-overflow warning #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sgn wants to merge 6 commits into
base: master
Choose a base branch
from
Open

qrenc: silence gcc -Wstringop-overflow warning #147

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44e025b
writeANSI: cleanup code style
sgn Jan 22, 2021
a3d7b1a
writeANSI: use size_t for variable intended for size
sgn Jan 22, 2021
fd9cb54
writeANSI: use strlen to find length of string
sgn Jan 22, 2021
6225427
writeANSI: allocate buffer based on longer color string
sgn Jan 22, 2021
176de82
writeANSI: use strcpy instead of strncat
sgn Jan 22, 2021
461d4e8
writeANSI, writeASCII: do not reset size
sgn Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 40 additions & 37 deletions qrenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,19 +733,26 @@ static int writeXPM(const QRcode *qrcode, const char *outfile)
return 0;
}

static void writeANSI_margin(FILE* fp, int realwidth,
char* buffer, const char* white, int white_s )
static void writeANSI_margin(FILE* fp, size_t realwidth,
char* buffer, const char* white, size_t white_s)
{
int y;

strncpy(buffer, white, (size_t)white_s);
memset(buffer + white_s, ' ', (size_t)realwidth * 2);
strncpy(buffer, white, white_s);
memset(buffer + white_s, ' ', realwidth * 2);
strcpy(buffer + white_s + realwidth * 2, "\033[0m\n"); // reset to default colors
for(y = 0; y < margin; y++ ){
for (y = 0; y < margin; y++) {
fputs(buffer, fp);
}
}

#define COPY_AND_ADVANCE(BUF, STR) \
do { \
strcpy(BUF, STR); \
BUF += strlen(STR); \
} while (0)


static int writeANSI(const QRcode *qrcode, const char *outfile)
{
FILE *fp;
Expand All @@ -756,29 +763,26 @@ static int writeANSI(const QRcode *qrcode, const char *outfile)

const char *white, *black;
char *buffer;
int white_s, black_s, buffer_s;
char *pbuf;
size_t white_s, black_s, buffer_s;

if(image_type == ANSI256_TYPE){
if (image_type == ANSI256_TYPE) {
/* codes for 256 color compatible terminals */
white = "\033[48;5;231m";
white_s = 11;
black = "\033[48;5;16m";
black_s = 10;
} else {
white = "\033[47m";
white_s = 5;
black = "\033[40m";
black_s = 5;
}

size = 1;
white_s = strlen(white);
black_s = strlen(black);

fp = openFile(outfile);

realwidth = (qrcode->width + margin * 2) * size;
buffer_s = (realwidth * white_s) * 2;
buffer = (char *)malloc((size_t)buffer_s);
if(buffer == NULL) {
realwidth = qrcode->width + margin * 2;
buffer_s = (realwidth * (white_s > black_s ? white_s : black_s)) * 2;
buffer = malloc(buffer_s);
if (buffer == NULL) {
fprintf(stderr, "Failed to allocate memory.\n");
exit(EXIT_FAILURE);
}
Expand All @@ -788,36 +792,37 @@ static int writeANSI(const QRcode *qrcode, const char *outfile)

/* data */
p = qrcode->data;
for(y = 0; y < qrcode->width; y++) {
row = (p+(y*qrcode->width));
for (y = 0; y < qrcode->width; y++) {
row = p + (y * qrcode->width);

memset(buffer, 0, (size_t)buffer_s);
strncpy(buffer, white, (size_t)white_s);
for(x = 0; x < margin; x++ ){
strncat(buffer, " ", 2);
memset(buffer, 0, buffer_s);
pbuf = buffer;
COPY_AND_ADVANCE(pbuf, white);
for (x = 0; x < margin; x++) {
COPY_AND_ADVANCE(pbuf, " ");
}
last = 0;

for(x = 0; x < qrcode->width; x++) {
if(*(row+x)&0x1) {
if( last != 1 ){
strncat(buffer, black, (size_t)black_s);
for (x = 0; x < qrcode->width; x++) {
if (row[x] & 0x1) {
if (last != 1) {
COPY_AND_ADVANCE(pbuf, black);
last = 1;
}
} else if( last != 0 ){
strncat(buffer, white, (size_t)white_s);
} else if(last != 0) {
COPY_AND_ADVANCE(pbuf, white);
last = 0;
}
strncat(buffer, " ", 2);
COPY_AND_ADVANCE(pbuf, " ");
}

if( last != 0 ){
strncat(buffer, white, (size_t)white_s);
if (last != 0) {
COPY_AND_ADVANCE(pbuf, white);
}
for(x = 0; x < margin; x++ ){
strncat(buffer, " ", 2);
for (x = 0; x < margin; x++) {
COPY_AND_ADVANCE(pbuf, " ");
}
strncat(buffer, "\033[0m\n", 5);
COPY_AND_ADVANCE(pbuf, "\033[0m\n");
fputs(buffer, fp);
}

Expand Down Expand Up @@ -959,8 +964,6 @@ static int writeASCII(const QRcode *qrcode, const char *outfile, int invert)
white = '#';
}

size = 1;

fp = openFile(outfile);

realwidth = (qrcode->width + margin * 2) * 2;
Expand Down