jdornak pushed to mysql-connector-odbc (f22). "Fix x_free() call (..more)"

[notifications at fedoraproject.org]

From e2f458ca04740487a025756dc657ea4303aa9533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Dor=C5=88=C3=A1k?= <jdornak at redhat.com>
Date: Tue, 9 Jun 2015 17:38:54 +0200
Subject: Fix x_free() call

Resolves: #1173783

diff --git a/mysql-connector-odbc-x_free.patch b/mysql-connector-odbc-x_free.patch
new file mode 100644
index 0000000..2e41daa
--- /dev/null
+++ b/mysql-connector-odbc-x_free.patch
@@ -0,0 +1,11 @@
+--- mysql-connector-odbc-5.3.4-src/util/odbcinstw.c.orig	2015-06-09 17:27:47.885638895 +0200
++++ mysql-connector-odbc-5.3.4-src/util/odbcinstw.c	2015-06-09 17:33:36.815128361 +0200
+@@ -105,7 +105,7 @@ MySQLGetPrivateProfileStringW(const MyOD
+   x_free(section);
+   x_free(entry);
+   x_free(def);
+-  x_free(ret);
++  if (ret) x_free(ret);
+   x_free(filename);
+ 
+   return rc;
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 4a43f7c..83099ca 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -28,6 +28,7 @@ Patch6: mysql-connector-odbc-cleartext.patch
 Patch7: mysql-connector-odbc-format-security.patch
 Patch8: mysql-connector-odbc-5.2.5-aarch64.patch
 Patch9: myodbc-mariadb10.patch
+Patch10: mysql-connector-odbc-x_free.patch
 
 BuildRequires: mysql-devel unixODBC-devel gtk3-devel
 BuildRequires: cmake
@@ -50,6 +51,7 @@ tar xfz %{SOURCE1}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # mysql_config does not support --cxxflags option
 sed -i 's/--cxxflags/--cflags/g' cmake/FindMySQL.cmake
@@ -100,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT/usr/test
 %{_libdir}/lib*so
 
 %changelog
+* Tue Jun  9 2015 Jakub Dorňák <jdornak at redhat.com> - 5.3.4-2
+- Fix x_free() call
+  Resolves: #1173783
+
 * Tue Jun  9 2015 Jakub Dorňák <jdornak at redhat.com> - 5.3.4-1
 - Rebase to version 5.3.4
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mysql-connector-odbc.git/commit/?h=f22&id=e2f458ca04740487a025756dc657ea4303aa9533