Fix a pair of printf security problems (upstream).
This commit is contained in:
parent
2939d05203
commit
a46f968137
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.59 2013/12/21 08:24:37 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.60 2014/03/09 21:57:38 ajacoutot Exp $
|
||||
|
||||
COMMENT= user interface builder for the gtk+3 toolkit
|
||||
|
||||
GNOME_VERSION= 3.16.1
|
||||
GNOME_PROJECT= glade
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
|
18
devel/glade/patches/patch-gladeui_glade-command_c
Normal file
18
devel/glade/patches/patch-gladeui_glade-command_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-gladeui_glade-command_c,v 1.1 2014/03/09 21:57:38 ajacoutot Exp $
|
||||
|
||||
From 259e506606f1804953182d1c1279c799ee10aede Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Sat, 21 Dec 2013 16:03:17 +0000
|
||||
Subject: gladeui: fix a pair of printf security problems
|
||||
|
||||
--- gladeui/glade-command.c.orig Wed Dec 18 16:00:38 2013
|
||||
+++ gladeui/glade-command.c Mon Mar 3 10:40:09 2014
|
||||
@@ -866,7 +866,7 @@ glade_command_set_properties_list (GladeProject *proje
|
||||
|
||||
multiple = g_list_length (me->sdata) > 1;
|
||||
if (multiple)
|
||||
- glade_command_push_group (cmd->priv->description);
|
||||
+ glade_command_push_group ("%s", cmd->priv->description);
|
||||
|
||||
glade_command_check_group (GLADE_COMMAND (me));
|
||||
|
18
devel/glade/patches/patch-gladeui_glade-command_h
Normal file
18
devel/glade/patches/patch-gladeui_glade-command_h
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-gladeui_glade-command_h,v 1.1 2014/03/09 21:57:38 ajacoutot Exp $
|
||||
|
||||
From 259e506606f1804953182d1c1279c799ee10aede Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Sat, 21 Dec 2013 16:03:17 +0000
|
||||
Subject: gladeui: fix a pair of printf security problems
|
||||
|
||||
--- gladeui/glade-command.h.orig Wed Dec 18 16:00:38 2013
|
||||
+++ gladeui/glade-command.h Mon Mar 3 10:40:09 2014
|
||||
@@ -66,7 +66,7 @@ struct _GladeCommandClass
|
||||
GType glade_command_get_type (void);
|
||||
|
||||
void glade_command_push_group (const gchar *fmt,
|
||||
- ...);
|
||||
+ ...) G_GNUC_PRINTF (1, 2);
|
||||
void glade_command_pop_group (void);
|
||||
gint glade_command_get_group_depth (void);
|
||||
|
18
devel/glade/patches/patch-gladeui_glade-project_c
Normal file
18
devel/glade/patches/patch-gladeui_glade-project_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-gladeui_glade-project_c,v 1.1 2014/03/09 21:57:38 ajacoutot Exp $
|
||||
|
||||
From 259e506606f1804953182d1c1279c799ee10aede Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Sat, 21 Dec 2013 16:03:17 +0000
|
||||
Subject: gladeui: fix a pair of printf security problems
|
||||
|
||||
--- gladeui/glade-project.c.orig Wed Dec 18 16:00:38 2013
|
||||
+++ gladeui/glade-project.c Mon Mar 3 10:40:09 2014
|
||||
@@ -1871,7 +1871,7 @@ glade_project_load_internal (GladeProject *project)
|
||||
|
||||
if (message)
|
||||
{
|
||||
- glade_util_ui_message (glade_app_get_window (), GLADE_UI_ERROR, NULL, message);
|
||||
+ glade_util_ui_message (glade_app_get_window (), GLADE_UI_ERROR, NULL, "%s", message);
|
||||
g_free (message);
|
||||
}
|
||||
else
|
25
devel/glade/patches/patch-gladeui_glade-utils_h
Normal file
25
devel/glade/patches/patch-gladeui_glade-utils_h
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-gladeui_glade-utils_h,v 1.1 2014/03/09 21:57:38 ajacoutot Exp $
|
||||
|
||||
From 259e506606f1804953182d1c1279c799ee10aede Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Sat, 21 Dec 2013 16:03:17 +0000
|
||||
Subject: gladeui: fix a pair of printf security problems
|
||||
|
||||
--- gladeui/glade-utils.h.orig Wed Nov 27 07:38:58 2013
|
||||
+++ gladeui/glade-utils.h Mon Mar 3 10:40:09 2014
|
||||
@@ -28,11 +28,13 @@ typedef enum
|
||||
gboolean glade_util_ui_message (GtkWidget *parent,
|
||||
GladeUIMessageType type,
|
||||
GtkWidget *widget,
|
||||
- const gchar *format, ...);
|
||||
+ const gchar *format,
|
||||
+ ...) G_GNUC_PRINTF (4, 5);
|
||||
|
||||
void glade_util_flash_message (GtkWidget *statusbar,
|
||||
guint context_id,
|
||||
- gchar *format, ...);
|
||||
+ gchar *format,
|
||||
+ ...) G_GNUC_PRINTF (3, 4);
|
||||
gboolean glade_util_url_show (const gchar *url);
|
||||
GtkWidget *glade_util_file_dialog_new (const gchar *title,
|
||||
GladeProject *project,
|
Loading…
x
Reference in New Issue
Block a user