Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/pyfltk/files: pyfltk-1.3.0-format-security.patch
Date: Fri, 26 Jun 2015 12:05:25
Message-Id: 20150626120517.58EAAA56@oystercatcher.gentoo.org
1 jlec 15/06/26 12:05:17
2
3 Added: pyfltk-1.3.0-format-security.patch
4 Log:
5 Add fix for format-security, bug #553314
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
8
9 Revision Changes Path
10 1.1 dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch?rev=1.1&content-type=text/plain
14
15 Index: pyfltk-1.3.0-format-security.patch
16 ===================================================================
17 python/fltk_wrap.cpp | 16 ++++++++--------
18 1 file changed, 8 insertions(+), 8 deletions(-)
19
20 diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
21 index 9c16f59..ad42e89 100644
22 --- a/python/fltk_wrap.cpp
23 +++ b/python/fltk_wrap.cpp
24 @@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
25
26 const char *fl_vararg_input(const char *label, const char *deflt = 0) {
27 const char* result = 0;
28 - result = fl_input(label, deflt);
29 + result = fl_input("%s", deflt, label);
30 return result;
31 };
32
33 const char *fl_vararg_password(const char *label, const char *deflt = 0) {
34 const char* result = 0;
35 - result = fl_password(label, deflt);
36 + result = fl_password("%s", deflt, label);
37 return result;
38 };
39
40 @@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
41
42 void fl_mt_message(const char* text) {
43 Py_BEGIN_ALLOW_THREADS;
44 - fl_message(text);
45 + fl_message("%s", text);
46 Py_END_ALLOW_THREADS;
47 };
48
49 void fl_mt_alert(const char* text) {
50 Py_BEGIN_ALLOW_THREADS;
51 - fl_alert(text);
52 + fl_alert("%s", text);
53 Py_END_ALLOW_THREADS;
54 };
55
56 int fl_mt_ask(const char* text) {
57 int status = 0;
58 Py_BEGIN_ALLOW_THREADS;
59 - status = fl_ask(text);
60 + status = fl_ask("%s", text);
61 Py_END_ALLOW_THREADS;
62 return status;
63 };
64 @@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
65 int fl_mt_choice(const char *q,const char *b0,const char *b1,const char *b2) {
66 int status = 0;
67 Py_BEGIN_ALLOW_THREADS;
68 - status = fl_choice(q, b0, b1, b2);
69 + status = fl_choice("%s", b0, b1, b2, q);
70 Py_END_ALLOW_THREADS;
71 return status;
72 };
73 @@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
74 const char *fl_mt_input(const char *label, const char *deflt = 0) {
75 const char* result = 0;
76 Py_BEGIN_ALLOW_THREADS;
77 - result = fl_input(label, deflt);
78 + result = fl_input("%s", deflt, label);
79 Py_END_ALLOW_THREADS;
80 return result;
81 };
82 @@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
83 const char *fl_mt_password(const char *label, const char *deflt = 0) {
84 const char* result = 0;
85 Py_BEGIN_ALLOW_THREADS;
86 - result = fl_password(label, deflt);
87 + result = fl_password("%s", deflt, label);
88 Py_END_ALLOW_THREADS;
89 return result;
90 };