diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2017-04-12 17:50:59 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-18 14:21:52 +0200 |
| commit | 6dc31ce48b712950f74a06708dd73da2cf38fe45 (patch) | |
| tree | 1bed8ac4876698fab408ae229c534ebab2b37891 /meta-xfce | |
| parent | 33b05cc85b89c2982d7ef81d0b349ef522bda2de (diff) | |
| download | meta-openembedded-contrib-6dc31ce48b712950f74a06708dd73da2cf38fe45.tar.gz | |
xarchiver: Upstream printf-fix-patch
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-xfce')
| -rw-r--r-- | meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch | 40 | ||||
| -rw-r--r-- | meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 6 |
2 files changed, 2 insertions, 44 deletions
diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch deleted file mode 100644 index a1158831ae..0000000000 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch +++ /dev/null @@ -1,40 +0,0 @@ -From baf93ea9acf845c5455d577ac19a6f680dac3d2d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 30 Mar 2017 11:22:42 -0700 -Subject: [PATCH] Add proper formatting string to printf-like functions - -Avoids potential security holes and makes compiler happy - -| ../../../../../../../workspace/sources/xarchiver/src/window.c:236:72: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] -| gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/window.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: git/src/window.c -=================================================================== ---- git.orig/src/window.c -+++ git/src/window.c -@@ -231,9 +231,9 @@ int xa_show_message_dialog (GtkWindow *w - { - int response; - -- dialog = gtk_message_dialog_new (window,mode,type,button,message1); -+ dialog = gtk_message_dialog_new (window,mode,type,button,"%s",message1); - gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_NO); -- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),"%s",message2); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - return response; -@@ -511,7 +511,7 @@ void xa_list_archive (GtkMenuItem *menui - g_fprintf (stream,_("Comment:\n")); - if (bp) - g_fprintf(stream,"</b><pre>"); -- g_fprintf (stream,archive[idx]->comment->str); -+ g_fprintf (stream,"%s",archive[idx]->comment->str); - if (bp) - g_fprintf(stream,"</pre>"); - g_fprintf (stream,"\n"); diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index ea34a52c14..e275af0314 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master \ - file://0001-Add-proper-formatting-string-to-printf-like-function.patch \ - " -SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" +SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" +SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814" PV = "0.5.3" S = "${WORKDIR}/git" |