[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/files/, dev-db/myodbc/

[Brian Evans]

commit:     ee33fca0291ace24e1155fe4c70fb8cf7cb399d4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 17:14:28 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 17:14:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee33fca0

dev-db/myodbc Add patch from bug 548912 and fix bug 557302

Package-Manager: portage-2.2.20

 dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 ++++++++++++++++++
 dev-db/myodbc/myodbc-5.2.7-r2.ebuild      |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch 
b/dev-db/myodbc/files/5.2.7-my_malloc.patch
new file mode 100644
index 0000000..bc6c65e
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-my_malloc.patch
@@ -0,0 +1,18 @@
+diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c
+--- a/util/odbcinstw.c 2014-04-23 21:54:40.000000000 +0200
++++ b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200
+@@ -68,13 +68,7 @@
+ 
+   if (lpszRetBuffer && cbRetBuffer)
+   {
+-    ret= malloc(cbRetBuffer + 1);
+-    /*
+-      We cannot rely on getting correct results from the next call of
+-      SQLGetPrivateProfileString. So, taking precautions against unititialized
+-      values in the allocated buffer.
+-    */
+-    memset(ret, 0, cbRetBuffer + 1);
++    ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL));
+   }
+   else
+     ret= NULL;

diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild 
b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index cf7133d..65b99da 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -44,8 +44,9 @@ src_prepare() {
 
        # Patch document path so it doesn't install files to /usr
        epatch "${FILESDIR}/cmake-doc-path.patch" \
-               "${FILESDIR}/${PVR}-cxxlinkage.patch" \
-               "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
+               "${FILESDIR}/${PV}-r1-cxxlinkage.patch" \
+               "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" \
+               "${FILESDIR}/${PV}-my_malloc.patch"
 }
 
 multilib_src_configure() {