From 66cf0d25eeb7938697ab5e011a56cfc3acf3813a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Fri, 15 Jan 2021 19:41:17 +0100 Subject: [PATCH] fix: don't use plain strings in vars as printf formats --- src/endian.c | 2 +- src/help-dialogs.c | 4 ++-- src/read-adaptive.c | 8 ++++---- src/read-linear.c | 4 ++-- src/rs01-fix.c | 4 ++-- src/rs01-verify.c | 2 +- src/rs02-create.c | 4 ++-- src/rs02-verify.c | 8 ++++---- src/rs03-create.c | 8 ++++---- src/rs03-verify.c | 4 ++-- src/scsi-layer.c | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/endian.c b/src/endian.c index 6e2c608..e0b2f76 100644 --- a/src/endian.c +++ b/src/endian.c @@ -62,7 +62,7 @@ guint64 SwapBytes64(guint64 in) */ void print_hex(char *label, guint8 *values, int n) -{ PrintCLI(label); +{ PrintCLI("%s", label); while(n--) PrintCLI("%02x ",*values++); diff --git a/src/help-dialogs.c b/src/help-dialogs.c index a366323..ea48d26 100644 --- a/src/help-dialogs.c +++ b/src/help-dialogs.c @@ -707,7 +707,7 @@ void AboutTextWithLink(GtkWidget *parent, char *text, char *action) g_free(utf); } } - else AboutText(parent, head); + else AboutText(parent, "%s", head); if(end_of_line) head = end_of_line+1; else break; @@ -739,7 +739,7 @@ void AboutDialog() text = g_strdup_printf("dvdisaster " "Version %s", Closure->cookedVersion); - AboutText(vbox, text); + AboutText(vbox, "%s", text); g_free(text); #ifdef MODIFIED_SOURCE diff --git a/src/read-adaptive.c b/src/read-adaptive.c index 87bd125..07e7ce3 100644 --- a/src/read-adaptive.c +++ b/src/read-adaptive.c @@ -1339,7 +1339,7 @@ void fill_gap(read_closure *rc) ChangeSpiralCursor(Closure->readAdaptiveSpiral, -1); } #endif - PrintCLI(t); + PrintCLI("%s", t); g_free(t); /*** Seek to end of image */ @@ -1615,7 +1615,7 @@ reopen_image: { char *t = _("\nSufficient data for reconstructing the image is available.\n"); if(rc->readMode != IMAGE_ONLY) - { PrintLog(t); + { PrintLog("%s", t); #ifndef CLI if(Closure->guiMode) SetAdaptiveReadFootline(t, Closure->greenText); @@ -1947,7 +1947,7 @@ reread: print_progress(rc, TRUE); if(rc->readMode != IMAGE_ONLY) - { PrintLog(t); + { PrintLog("%s", t); #ifndef CLI if(Closure->guiMode && rc->ei) SetAdaptiveReadFootline(t, Closure->foreground); @@ -2128,7 +2128,7 @@ finished: if(rc->readMode == IMAGE_ONLY) { if(rc->readable == rc->expectedSectors) { char *t = _("\nGood! All sectors have been read.\n"); - PrintLog(t); + PrintLog("%s", t); #ifndef CLI if(Closure->guiMode) SetAdaptiveReadFootline(t, Closure->foreground); diff --git a/src/read-linear.c b/src/read-linear.c index 0b4b6f4..bb0421f 100644 --- a/src/read-linear.c +++ b/src/read-linear.c @@ -1087,7 +1087,7 @@ reread: g_mutex_lock(rc->mutex); if(rc->workerError) /* something went wrong in the worker thread */ { g_mutex_unlock(rc->mutex); - Stop(rc->workerError); + Stop("%s", rc->workerError); } while(rc->bufState[rc->readPtr] != BUF_EMPTY) { g_cond_wait(rc->canRead, rc->mutex); @@ -1240,7 +1240,7 @@ reread: g_mutex_lock(rc->mutex); if(rc->workerError) /* something went wrong in the worker thread */ { g_mutex_unlock(rc->mutex); - Stop(rc->workerError); + Stop("%s", rc->workerError); } while(rc->bufState[rc->readPtr] != BUF_EMPTY) diff --git a/src/rs01-fix.c b/src/rs01-fix.c index 021f22e..3da6744 100644 --- a/src/rs01-fix.c +++ b/src/rs01-fix.c @@ -322,8 +322,8 @@ void RS01Fix(Image *image) { int answer; answer = ModalWarningOrCLI(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL, - _("Image file appears to be truncated.\n" - "Consider completing it with another reading pass before going on.\n"), NULL); + "%s",_("Image file appears to be truncated.\n" + "Consider completing it with another reading pass before going on.\n")); if(!answer) { #ifndef CLI diff --git a/src/rs01-verify.c b/src/rs01-verify.c index 3f56104..d7dd9b2 100644 --- a/src/rs01-verify.c +++ b/src/rs01-verify.c @@ -946,7 +946,7 @@ skip_ecc: #ifndef CLI if(Closure->guiMode) { if(ecc_advice) - { SetLabelText(GTK_LABEL(wl->cmpEccResult), ecc_advice); + { SetLabelText(GTK_LABEL(wl->cmpEccResult), "%s", ecc_advice); g_free(ecc_advice); } else SetLabelText(GTK_LABEL(wl->cmpEccResult), diff --git a/src/rs02-create.c b/src/rs02-create.c index bf4621e..1422382 100644 --- a/src/rs02-create.c +++ b/src/rs02-create.c @@ -1143,8 +1143,8 @@ void RS02Create(void) { int answer; answer = ModalWarningOrCLI(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, NULL, - _("Using redundancies below 20%% may not give\n" - "the expected data loss protection.\n"), NULL); + "%s", _("Using redundancies below 20% may not give\n" + "the expected data loss protection.\n")); if(!answer) abort_encoding(ec, FALSE); diff --git a/src/rs02-verify.c b/src/rs02-verify.c index b5ade75..3b8cac7 100644 --- a/src/rs02-verify.c +++ b/src/rs02-verify.c @@ -917,7 +917,7 @@ void RS02Verify(Image *image) SetLabelText(GTK_LABEL(wl->cmpImageMd5Sum), "%s", data_missing ? "-" : data_digest); if(img_advice) - { SetLabelText(GTK_LABEL(wl->cmpImageResult), img_advice); + { SetLabelText(GTK_LABEL(wl->cmpImageResult), "%s", img_advice); g_free(img_advice); } else @@ -935,7 +935,7 @@ void RS02Verify(Image *image) #endif { if(img_advice) - { PrintLog(img_advice); + { PrintLog("%s", img_advice); } } @@ -1170,7 +1170,7 @@ continue_with_ecc: #ifndef CLI if(Closure->guiMode) { if(ecc_advice) - { SetLabelText(GTK_LABEL(wl->cmpEccResult), ecc_advice); + { SetLabelText(GTK_LABEL(wl->cmpEccResult), "%s", ecc_advice); g_free(ecc_advice); } else @@ -1190,7 +1190,7 @@ continue_with_ecc: else #endif { if(ecc_advice) - { PrintLog(ecc_advice); + { PrintLog("%s", ecc_advice); g_free(ecc_advice); } } diff --git a/src/rs03-create.c b/src/rs03-create.c index a7f90b6..befa1d9 100644 --- a/src/rs03-create.c +++ b/src/rs03-create.c @@ -1406,8 +1406,8 @@ void RS03Create(void) { int answer; answer = ModalWarningOrCLI(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, NULL, - _("Using redundancies below 20%% may not give\n" - "the expected data loss protection.\n"), NULL); + "%s", _("Using redundancies below 20% may not give\n" + "the expected data loss protection.\n")); if(!answer) abort_encoding(ec, FALSE); @@ -1422,8 +1422,8 @@ void RS03Create(void) { int answer; answer = ModalWarningOrCLI(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, NULL, - _("BD-R size with no defect management enabled,\n" - "remember it should you need to repair this image later!\n"), NULL); + "%s", _("BD-R size with no defect management enabled,\n" + "remember it should you need to repair this image later!\n")); if(!answer) abort_encoding(ec, FALSE); diff --git a/src/rs03-verify.c b/src/rs03-verify.c index 26340df..42e0370 100644 --- a/src/rs03-verify.c +++ b/src/rs03-verify.c @@ -945,7 +945,7 @@ void RS03Verify(Image *image) #ifndef CLI if(Closure->guiMode) { if(ecc_advice) - { SetLabelText(GTK_LABEL(wl->cmpEccResult), ecc_advice); + { SetLabelText(GTK_LABEL(wl->cmpEccResult), "%s", ecc_advice); g_free(ecc_advice); } else SetLabelText(GTK_LABEL(wl->cmpEccResult), @@ -1379,7 +1379,7 @@ void RS03Verify(Image *image) if(Closure->guiMode) { if(img_advice) - { SetLabelText(GTK_LABEL(wl->cmpImageResult), img_advice); + { SetLabelText(GTK_LABEL(wl->cmpImageResult), "%s", img_advice); g_free(img_advice); } else diff --git a/src/scsi-layer.c b/src/scsi-layer.c index 487a64a..b1db2b1 100644 --- a/src/scsi-layer.c +++ b/src/scsi-layer.c @@ -2009,7 +2009,7 @@ static gint64 query_size(Image *image) } g_string_append_printf(warning, _("Final decision: %s\n\n"), decision_msg); - LogWarning(warning->str); + LogWarning("%s", warning->str); g_string_free(warning, TRUE);