rpms/lesstif/FC-3 lesstif-0.93.15-CAN-2004-0914_sec8.patch, NONE, 1.1 lesstif-0.93.15-CAN-2005-0605.patch, NONE, 1.1 lesstif.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/lesstif/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv3676

Modified Files:
	lesstif.spec 
Added Files:
	lesstif-0.93.15-CAN-2004-0914_sec8.patch 
	lesstif-0.93.15-CAN-2005-0605.patch 
Log Message:
[tw]
- fixed possible libXpm overflows (#151640)
- allow to write XPM files with absolute path names again (#140815)



lesstif-0.93.15-CAN-2004-0914_sec8.patch:
 LTXpm.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE lesstif-0.93.15-CAN-2004-0914_sec8.patch ---
--- lesstif-0.93.15/lib/Xm/LTXpm.c.CAN-2004-0914_sec8	2004-11-30 15:08:25.871148884 +0100
+++ lesstif-0.93.15/lib/Xm/LTXpm.c	2004-11-30 15:08:27.291954174 +0100
@@ -1442,10 +1442,7 @@
 #ifndef NO_ZPIPE
 	size_t len = strlen(filename);
 
-	if(len == 0                        ||
-	   filename[0] == '/'              ||
-	   strstr(filename, "../") != NULL ||
-	   filename[len-1] == '/')
+	if(len == 0)
 		return(_LtXpmOpenFailed);
 
 	if (len > 2 && !strcmp(".Z", filename + (len - 2))) {

lesstif-0.93.15-CAN-2005-0605.patch:
 LTXpm.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE lesstif-0.93.15-CAN-2005-0605.patch ---
--- lesstif-0.93.15/lib/Xm/LTXpm.c.CAN-2005-0605	2005-05-06 16:01:33.000000000 +0200
+++ lesstif-0.93.15/lib/Xm/LTXpm.c	2005-05-06 16:03:23.000000000 +0200
@@ -2721,10 +2721,10 @@
     register char *src;
     register char *dst;
     register unsigned int *iptr;
-    register unsigned int x, y, i;
+    register unsigned int x, y;
     register char *data;
     Pixel pixel, px;
-    int nbytes, depth, ibu, ibpp;
+    int nbytes, depth, ibu, ibpp, i;
 
     data = image->data;
     iptr = pixelindex;
@@ -6418,8 +6418,8 @@
     char *dst;
     unsigned int *iptr;
     char *data;
-    unsigned int x, y, i;
-    int bits, depth, ibu, ibpp, offset;
+    unsigned int x, y;
+    int bits, depth, ibu, ibpp, offset, i;
     unsigned long lbt;
     Pixel pixel, px;
 
@@ -6430,6 +6430,9 @@
     ibpp = image->bits_per_pixel;
     offset = image->xoffset;
 
+    if (image->bitmap_unit < 0)
+        return (_LtXpmNoMemory);
+
     if ((image->bits_per_pixel | image->depth) == 1) {
 	ibu = image->bitmap_unit;
 	for (y = 0; y < height; y++)


Index: lesstif.spec
===================================================================
RCS file: /cvs/dist/rpms/lesstif/FC-3/lesstif.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lesstif.spec	26 Nov 2004 11:55:20 -0000	1.12
+++ lesstif.spec	6 May 2005 14:13:21 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: An OSF/Motif(R) clone.
 Name: lesstif
 Version: 0.93.36
-Release: 6.FC3.1
+Release: 6.FC3.2
 License: LGPL
 Group: Development/Libraries
 Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2
@@ -13,6 +13,8 @@
 Patch0: lesstif-0.93.36-libtool.patch
 Patch2: lesstif-0.93.15-CAN-2004-0687-0688.patch
 Patch3: lesstif-0.93.15-CAN-2004-0914.patch
+Patch4: lesstif-0.93.15-CAN-2004-0914_sec8.patch
+Patch5: lesstif-0.93.15-CAN-2005-0605.patch
 
 Obsoletes: lesstif-clients
 Obsoletes: lesstif-mwm
@@ -210,6 +212,10 @@
 %endif
 
 %changelog
+* Fri May  6 2005 Thomas Woerner <twoerner at redhat.com> 0.93-36-6.FC3.2
+- fixed possible libXpm overflows (#151640)
+- allow to write XPM files with absolute path names again (#140815)
+
 * Fri Nov 26 2004 Thomas Woerner <twoerner at redhat.com> 0.93.36-6.FC3.1
 - fixed CAN-2004-0687 (integer overflows) and CAN-2004-0688 (stack overflows)
   in embedded Xpm library (#135080)