rpms/openmotif/FC-4 openMotif-2.2.3-mrm.patch, NONE, 1.1 openmotif.spec, 1.30, 1.31

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 2 15:23:54 UTC 2005


Author: twoerner

Update of /cvs/dist/rpms/openmotif/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17073

Modified Files:
	openmotif.spec 
Added Files:
	openMotif-2.2.3-mrm.patch 
Log Message:
[tw]
- fixed mrm initialization error in MrmOpenHierarchyPerDisplay (#167094)
  Thanks to Arjan van de Ven for the patch.



openMotif-2.2.3-mrm.patch:
 MrmIheader.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openMotif-2.2.3-mrm.patch ---
--- openMotif-2.2.3/lib/Mrm/MrmIheader.c.mrm	2003-08-15 17:04:34.000000000 +0200
+++ openMotif-2.2.3/lib/Mrm/MrmIheader.c	2005-09-02 17:16:37.000000000 +0200
@@ -228,9 +228,10 @@
 
   {
     /* sscanf() may call ungetc(), which would write the XmConst string. */
-    char buf[XtNumber(idb__database_version) + 1];
+    char *buf = XtMalloc(strlen(idb__database_version) + 1);
     strcpy(buf, idb__database_version);
     sscanf(buf, "URM %d.%d", &db_major, &db_minor);
+    XtFree(buf);
   }
     
   if ((file_major > db_major) ||


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/FC-4/openmotif.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openmotif.spec	4 Apr 2005 14:52:31 -0000	1.30
+++ openmotif.spec	2 Sep 2005 15:23:51 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.2.3
-Release: 10
+Release: 10.FC4.1
 License: Open Group Public License
 Group: System Environment/Libraries
 Source:  %{intern_name}-%{version}.tar.gz
@@ -38,6 +38,7 @@
 Patch39: openMotif-2.2.3-motifzone_1193.patch
 Patch40: openMotif-2.2.3-motifzone_1202.patch
 Patch41: openMotif-2.2.3-CAN-2005-0605.patch
+Patch42: openMotif-2.2.3-mrm.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -81,6 +82,7 @@
 %patch39 -p1 -b .motifzone_1193
 %patch40 -p1 -b .motifzone_1202
 %patch41 -p1 -b .CAN-2005-0605
+%patch42 -p1 -b .mrm
 
 for i in doc/man/man3/{XmColumn,XmDataField}.3; do
 	iconv -f windows-1252 -t utf-8 < "$i" > "${i}_"
@@ -163,6 +165,10 @@
 %{prefix}/man/man5/*
 
 %changelog
+* Fri Sep  2 2005 Thomas Woerner <twoerner at redhat.com> 2.2.3-10.FC4.1
+- fixed mrm initialization error in MrmOpenHierarchyPerDisplay (#167094)
+  Thanks to Arjan van de Ven for the patch.
+
 * Mon Apr  4 2005 Thomas Woerner <twoerner at redhat.com> 2.2.3-10
 - fixed possible libXpm overflows (#151642)
 




More information about the fedora-cvs-commits mailing list