Accepting request 54436 from graphics

Accepted submit request 54436 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/54436
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfig?expand=0&rev=22

xfig.3.2.5b-bnc657393.dif

@@ -0,0 +1,22 @@
+--- w_msgpanel.c
++++ w_msgpanel.c	2010-12-03 14:21:07.931926127 +0000
+@@ -60,7 +60,7 @@ DeclareStaticArgs(12);
+ /* for the popup message (file_msg) window */
+ 
+ static int	file_msg_length=0;
+-static char	tmpstr[300];
++static char	tmpstr[512];
+ static Widget	file_msg_panel,
+ 		file_msg_win, file_msg_dismiss;
+ 
+@@ -582,8 +582,8 @@ file_msg(char *format,...)
+     }
+ 
+     va_start(ap, format);
+-    /* format the string */
+-    vsprintf(tmpstr, format, ap);
++    /* format the string (but leave room for \n and \0) */
++    vsnprintf(tmpstr, sizeof(tmpstr)-2, format, ap);
+     va_end(ap);
+ 
+     strcat(tmpstr,"\n");

xfig.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec  3 15:23:11 CET 2010 - werner@suse.de
+
+- Fix overflow in formatted output conversion (bnc#657393)
+
 -------------------------------------------------------------------
 Wed Dec  1 12:27:48 CET 2010 - werner@suse.de
 

xfig.spec

@@ -49,6 +49,7 @@ Patch7:         xfig.3.2.5b-fixes.dif
 Patch8:         xfig.3.2.5b-pspdftex.dif
 Patch9:         xfig.3.2.5b-libpng14.dif
 Patch10:        xfig.3.2.5b-preview.dif
+Patch11:        xfig.3.2.5b-bnc657393.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
@@ -96,6 +97,7 @@ find -type f | xargs -r chmod a-x,go-w
 %patch8  -p0 -b .pspdftex
 %patch9  -p0 -b .libpng14
 %patch10 -p0 -b .preview
+%patch11 -p0 -b .vsprintf
 cp %{S:1} .
 
 %build