diff options
| author |   David Seifert <soap@gentoo.org> | 2016-01-23 22:10:04 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-01-23 22:10:21 +0100 |
| commit | 66da6ac358831d13347da35fafdd6b305b7c3b6b (patch) | |
| tree | f246010e7f9ddd88175cbeecdcb533125567c353 /sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch | |
| parent | dev-python/pygpgme: Add python3.5 (diff) | |
| download | gentoo-66da6ac358831d13347da35fafdd6b305b7c3b6b.tar.gz gentoo-66da6ac358831d13347da35fafdd6b305b7c3b6b.tar.bz2 gentoo-66da6ac358831d13347da35fafdd6b305b7c3b6b.zip | |
sci-calculators/qalculate-gtk: Fix -Werror=format-security errors
Gentoo-Bug: 541986
Update patch for eventual EAPI=6 update to gnome2.eclass by
making it patchable with -p1.
Package-Manager: portage-2.2.27
Diffstat (limited to 'sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch')
| -rw-r--r-- | sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch new file mode 100644 index 000000000000..dee57dd54503 --- /dev/null +++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch @@ -0,0 +1,48 @@ +Fix -Werror=format-security errors +https://bugs.gentoo.org/show_bug.cgi?id=541986 + +callbacks.cc: In function ‘void show_message(const gchar*, GtkWidget*)’: +callbacks.cc:391:137: error: format not a string literal and no format arguments [-Werror=format-security] + GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, text); + +--- qalculate-gtk-0.9.7/src/callbacks.cc ++++ qalculate-gtk-0.9.7/src/callbacks.cc +@@ -388,12 +388,12 @@ + } + + void show_message(const gchar *text, GtkWidget *win) { +- GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, text); ++ GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", text); + gtk_dialog_run(GTK_DIALOG(edialog)); + gtk_widget_destroy(edialog); + } + bool ask_question(const gchar *text, GtkWidget *win) { +- GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, text); ++ GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, "%s", text); + int question_answer = gtk_dialog_run(GTK_DIALOG(edialog)); + gtk_widget_destroy(edialog); + return question_answer == GTK_RESPONSE_YES; +@@ -654,6 +654,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, ++ "%s", + CALCULATOR->message()->message().c_str()); + gtk_dialog_run(GTK_DIALOG(edialog)); + gtk_widget_destroy(edialog); +@@ -667,6 +668,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, ++ "%s", + str.c_str()); + } else { + edialog = gtk_message_dialog_new( +@@ -674,6 +676,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_CLOSE, ++ "%s", + str.c_str()); + } + |