rpms/hamlib/F-12 hamlib-1.2.10-vfo-copy.patch, NONE, 1.1 hamlib.spec, 1.45, 1.46 hamlib-bindings-1.2.7.patch, 1.1, NONE hamlib-bindings-1.2.8.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27424

Modified Files:
	hamlib.spec 
Added Files:
	hamlib-1.2.10-vfo-copy.patch 
Removed Files:
	hamlib-bindings-1.2.7.patch hamlib-bindings-1.2.8.patch 
Log Message:
fix double-free in cleanup in dummy module

hamlib-1.2.10-vfo-copy.patch:
 dummy.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE hamlib-1.2.10-vfo-copy.patch ---
diff -Naur hamlib-1.2.10/dummy/dummy.c hamlib-1.2.10-mod/dummy/dummy.c
--- hamlib-1.2.10/dummy/dummy.c	2009-11-03 00:17:47.000000000 +0200
+++ hamlib-1.2.10-mod/dummy/dummy.c	2010-05-09 10:42:29.000000000 +0300
@@ -206,8 +206,12 @@
   for (i=0; i<NB_CHAN; i++) {
 	free(priv->mem[i].ext_levels);
   }
-  free(priv->vfo_a.ext_levels);
-  free(priv->vfo_b.ext_levels);
+  if (priv->vfo_a.ext_levels != priv->vfo_b.ext_levels) {
+  	free(priv->vfo_a.ext_levels);
+  	free(priv->vfo_b.ext_levels);
+  } else {
+  	free(priv->vfo_a.ext_levels);
+  }
   free(priv->ext_parms);
 
   if (rig->state.priv)


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-12/hamlib.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- hamlib.spec	11 Mar 2010 17:57:05 -0000	1.45
+++ hamlib.spec	9 May 2010 11:19:20 -0000	1.46
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@ URL:            http://hamlib.sourceforg
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 #Install python and perl bindings into proper dirs
 Patch0:         hamlib-1.2.10-bindings.patch
+Patch1:         hamlib-1.2.10-vfo-copy.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +30,7 @@ which lets one control a radio transceiv
 command line interface or in a text-oriented interactive interface.
 
 %package devel
-Summary: Development library to control radio transcievers and receivers
+Summary: Development library to control radio transceivers and receivers
 Group: Development/Libraries
 Requires: hamlib = %{version}-%{release}, pkgconfig
 
@@ -91,6 +92,7 @@ Hamlib TCL Language bindings to allow ra
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .vfo-copy
 
 %build
 %configure \
@@ -211,6 +213,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Sun May 09 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-3
+- description cleanup
+- fix double-free in cleanup in dummy module (#587701)
+
 * Thu Mar 11 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-2
 - kill rpath
 - misc cleanups


--- hamlib-bindings-1.2.7.patch DELETED ---


--- hamlib-bindings-1.2.8.patch DELETED ---