rpms/xv/F-17 xv-3.10a-namemax.patch,1.1,1.2 xv.spec,1.10,1.11

[L. Gabriel Somlo]

Author: somlo

Update of /cvs/nonfree/rpms/xv/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4777

Modified Files:
	xv-3.10a-namemax.patch xv.spec 
Log Message:
* Thu Mar 14 2013 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-17
- additional fix for long filename buffer overflow


xv-3.10a-namemax.patch:
 xv.c     |    4 ++--
 xvtext.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: xv-3.10a-namemax.patch
===================================================================
RCS file: /cvs/nonfree/rpms/xv/F-17/xv-3.10a-namemax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xv-3.10a-namemax.patch	4 Mar 2013 22:27:22 -0000	1.1
+++ xv-3.10a-namemax.patch	14 Mar 2013 14:34:57 -0000	1.2
@@ -1,6 +1,35 @@
-diff -NarU5 xv-3.10a/xvtext.c xv-3.10a.namemax/xvtext.c
---- xv-3.10a/xvtext.c	2013-03-04 16:34:40.000000000 -0500
-+++ xv-3.10a.namemax/xvtext.c	2013-03-04 16:50:39.217371154 -0500
+diff -NarU5 xv-3.10a.orig/xv.c xv-3.10a/xv.c
+--- xv-3.10a.orig/xv.c	2013-03-14 09:37:32.095682131 -0400
++++ xv-3.10a/xv.c	2013-03-14 09:55:10.629312017 -0400
+@@ -62,11 +62,11 @@
+ static double vexpand = 1.0;    /* '-expand' argument */
+ static const char *maingeom = NULL;
+ static const char *icongeom = NULL;
+ static Atom   __SWM_VROOT = None;
+ 
+-static char   basefname[128];   /* just the current fname, no path */
++static char   basefname[NAME_MAX+1];   /* just the current fname, no path */
+ 
+ #ifdef TV_L10N
+ #  ifndef TV_FONTSET
+ #    define TV_FONTSET "-*-fixed-medium-r-normal--%d-*"
+ #  endif
+@@ -3998,11 +3998,11 @@
+ 
+ /***********************************/
+ static void setWinIconNames(name)
+      const char *name;
+ {
+-  char winname[256], iconname[256];
++  char winname[NAME_MAX+sizeof("xv : ")+sizeof(VERSTR)+sizeof(" <unregistered>")+1], iconname[NAME_MAX+1];
+ 
+   if (winTitle) {
+     strcpy(winname, winTitle);
+     strcpy(iconname, winTitle);
+   }
+diff -NarU5 xv-3.10a.orig/xvtext.c xv-3.10a/xvtext.c
+--- xv-3.10a.orig/xvtext.c	2013-03-14 09:37:32.129684079 -0400
++++ xv-3.10a/xvtext.c	2013-03-14 09:38:44.288818545 -0400
 @@ -51,11 +51,11 @@
  #  define TV_MSCODE   7
  
@@ -8,7 +37,7 @@
  #endif
  
 -#define TITLELEN 128
-+#define TITLELEN NAME_MAX
++#define TITLELEN (NAME_MAX+sizeof("File: ''")+1)
  
  #ifdef TV_MULTILINGUAL
  struct coding_spec {


Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/F-17/xv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xv.spec	4 Mar 2013 22:27:22 -0000	1.10
+++ xv.spec	14 Mar 2013 14:34:57 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name: xv
 Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: Interactive image display program for X
 Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
 Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -281,6 +281,9 @@
 %doc %{_docdir}/%{name}-%{vprog}/manuals/
 
 %changelog
+* Thu Mar 14 2013 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-17
+- additional fix for long filename buffer overflow
+
 * Mon Mar  4 2013 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-16
 - fix buffer overflow caused by filenames longer than the window title limit