diff options
author | Brian Evans <grknight@gentoo.org> | 2015-08-11 13:14:28 -0400 |
---|---|---|
committer | Brian Evans <grknight@gentoo.org> | 2015-08-11 13:14:28 -0400 |
commit | ee33fca0291ace24e1155fe4c70fb8cf7cb399d4 (patch) | |
tree | d8eaa62af19e6c838bf266a559f0fe9ba2584b30 /dev-db/myodbc | |
parent | 1c7eaf896a4f3dd1620e961ca1e7a6fbac22f029 (diff) | |
download | gentoo-ee33fca0291ace24e1155fe4c70fb8cf7cb399d4.tar.gz gentoo-ee33fca0291ace24e1155fe4c70fb8cf7cb399d4.tar.xz |
dev-db/myodbc Add patch from bug 548912 and fix bug 557302
Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-db/myodbc')
-rw-r--r-- | dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 | ||||
-rw-r--r-- | 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 00000000000..bc6c65ef301 --- /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 cf7133d4717..65b99da610d 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() { |