rpms/mc/FC-3 mc-miscfix.patch,1.2,1.3 mc.spec,1.38,1.39

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	mc-miscfix.patch mc.spec 
Log Message:

- fix invalid memory allocation in menu.c (#155468)



mc-miscfix.patch:
 edit/edit.c     |   16 +++++++---------
 edit/editdraw.c |    6 +++---
 src/widget.c    |    3 +--
 3 files changed, 11 insertions(+), 14 deletions(-)

Index: mc-miscfix.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-3/mc-miscfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mc-miscfix.patch	20 Apr 2005 13:24:04 -0000	1.2
+++ mc-miscfix.patch	21 Apr 2005 07:16:32 -0000	1.3
@@ -74,15 +74,3 @@
      if (!in->point)
  	return;
  
---- mc-4.6.1-pre3/src/menu.c.miscfix	2005-04-15 09:41:40.999581208 +0200
-+++ mc-4.6.1-pre3/src/menu.c	2005-04-15 09:41:41.011579384 +0200
-@@ -112,8 +112,7 @@ create_menu (const char *name, menu_entr
-       int len;
- 
-       menu->wentries = (wchar_t **)
--                       g_malloc (sizeof (wchar_t *) * menu->count
--                                 + wlen * sizeof (wchar_t));
-+		       g_malloc ((menu->count + wlen) * sizeof (wchar_t));
-       wp = (wchar_t *) (menu->wentries + menu->count);
-       str = menu->name;
-       len = mbsrtowcs (wp, &str, wlen, &s);


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-3/mc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mc.spec	20 Apr 2005 13:24:04 -0000	1.38
+++ mc.spec	21 Apr 2005 07:16:32 -0000	1.39
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1
-Release:	0.13.FC3
+Release:	0.14.FC3
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -172,7 +172,10 @@
 %dir %{_datadir}/mc
 
 %changelog
-* Fri Apr 20 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.13.FC3
+* Thu Apr 21 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.14.FC3
+- fix invalid memory allocation in menu.c (#155468)
+
+* Wed Apr 20 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.13.FC3
 - fix refusal to chdir/start file action when spaces are typed in
   command prompt and Enter is pressed (#151637)
 - add displaying of username and hostname in xterm title