mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Fix to the coredump in the library code of the Samba libs. Provided by Andrey Kramarenko.

Browse Source 
https://bugzilla.samba.org/show_bug.cgi?id=11455
This commit is contained in:
Timur I. Bakeyev 2015-09-19 13:36:27 +00:00
parent 4a34be3e77
commit 259a2b0a1b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=397323
6 changed files with 207 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/ldb/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= ldb
PORTVERSION= 1.1.21
PORTREVISION= 0
PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= databases
MASTER_SITES= SAMBA

68
databases/ldb/files/patch-lib_replace_replace.c Normal file
View File

@ -0,0 +1,68 @@
From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 18 Aug 2015 20:57:27 +0200
Subject: [PATCH] replace: Fix bug 11455
Don't call rep_strtoull recursively
Signed-off-by: Volker Lendecke <vl@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455
https://lists.samba.org/archive/samba-technical/2015-July/108587.html
https://lists.samba.org/archive/samba-technical/2015-July/108588.html
--- ./lib/replace/replace.c.orig 2015-09-18 23:51:08 UTC
+++ ./lib/replace/replace.c 2015-09-18 23:51:08 UTC
@@ -518,8 +518,10 @@
}
#else
#ifdef HAVE_BSD_STRTOLL
+#undef strtoll
long long int rep_strtoll(const char *str, char **endptr, int base)
{
+ int errno0 = errno;
long long int nb = strtoll(str, endptr, base);
/* With glibc EINVAL is only returned if base is not ok */
if (errno == EINVAL) {
@@ -528,7 +530,7 @@
* able to make the convertion.
* Let's reset errno.
*/
- errno = 0;
+ errno = errno0;
}
}
return nb;
@@ -551,26 +553,24 @@
#endif
}
#else
-#ifdef HAVE_BSD_STRTOLL
-#ifdef HAVE_STRTOUQ
+#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+#undef strtoull
unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
{
- unsigned long long int nb = strtouq(str, endptr, base);
- /* In linux EINVAL is only returned if base is not ok */
+ int errno0 = errno;
+ unsigned long long int nb = strtoull(str, endptr, base);
+ /* With glibc EINVAL is only returned if base is not ok */
if (errno == EINVAL) {
if (base == 0 || (base >1 && base <37)) {
/* Base was ok so it's because we were not
* able to make the convertion.
* Let's reset errno.
*/
- errno = 0;
+ errno = errno0;
}
}
return nb;
}
-#else
-#error "You need the strtouq function"
-#endif /* HAVE_STRTOUQ */
#endif /* HAVE_BSD_STRTOLL */
#endif /* HAVE_STRTOULL */

2
databases/tdb/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= tdb
PORTVERSION= 1.3.7
PORTREVISION= 0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SAMBA

68
databases/tdb/files/patch-lib_replace_replace.c Normal file
View File

@ -0,0 +1,68 @@
From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 18 Aug 2015 20:57:27 +0200
Subject: [PATCH] replace: Fix bug 11455
Don't call rep_strtoull recursively
Signed-off-by: Volker Lendecke <vl@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455
https://lists.samba.org/archive/samba-technical/2015-July/108587.html
https://lists.samba.org/archive/samba-technical/2015-July/108588.html
--- ./lib/replace/replace.c.orig 2015-09-18 23:51:08 UTC
+++ ./lib/replace/replace.c 2015-09-18 23:51:08 UTC
@@ -518,8 +518,10 @@
}
#else
#ifdef HAVE_BSD_STRTOLL
+#undef strtoll
long long int rep_strtoll(const char *str, char **endptr, int base)
{
+ int errno0 = errno;
long long int nb = strtoll(str, endptr, base);
/* With glibc EINVAL is only returned if base is not ok */
if (errno == EINVAL) {
@@ -528,7 +530,7 @@
* able to make the convertion.
* Let's reset errno.
*/
- errno = 0;
+ errno = errno0;
}
}
return nb;
@@ -551,26 +553,24 @@
#endif
}
#else
-#ifdef HAVE_BSD_STRTOLL
-#ifdef HAVE_STRTOUQ
+#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+#undef strtoull
unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
{
- unsigned long long int nb = strtouq(str, endptr, base);
- /* In linux EINVAL is only returned if base is not ok */
+ int errno0 = errno;
+ unsigned long long int nb = strtoull(str, endptr, base);
+ /* With glibc EINVAL is only returned if base is not ok */
if (errno == EINVAL) {
if (base == 0 || (base >1 && base <37)) {
/* Base was ok so it's because we were not
* able to make the convertion.
* Let's reset errno.
*/
- errno = 0;
+ errno = errno0;
}
}
return nb;
}
-#else
-#error "You need the strtouq function"
-#endif /* HAVE_STRTOUQ */
#endif /* HAVE_BSD_STRTOLL */
#endif /* HAVE_STRTOULL */

2
devel/talloc/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= talloc
PORTVERSION= 2.1.3
PORTREVISION= 0
PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= devel
MASTER_SITES= SAMBA

68
devel/talloc/files/patch-lib_replace_replace.c Normal file
View File

@ -0,0 +1,68 @@
From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 18 Aug 2015 20:57:27 +0200
Subject: [PATCH] replace: Fix bug 11455
Don't call rep_strtoull recursively
Signed-off-by: Volker Lendecke <vl@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455
https://lists.samba.org/archive/samba-technical/2015-July/108587.html
https://lists.samba.org/archive/samba-technical/2015-July/108588.html
--- ./lib/replace/replace.c.orig 2015-09-18 23:51:08 UTC
+++ ./lib/replace/replace.c 2015-09-18 23:51:08 UTC
@@ -518,8 +518,10 @@
}
#else
#ifdef HAVE_BSD_STRTOLL
+#undef strtoll
long long int rep_strtoll(const char *str, char **endptr, int base)
{
+ int errno0 = errno;
long long int nb = strtoll(str, endptr, base);
/* With glibc EINVAL is only returned if base is not ok */
if (errno == EINVAL) {
@@ -528,7 +530,7 @@
* able to make the convertion.
* Let's reset errno.
*/
- errno = 0;
+ errno = errno0;
}
}
return nb;
@@ -551,26 +553,24 @@
#endif
}
#else
-#ifdef HAVE_BSD_STRTOLL
-#ifdef HAVE_STRTOUQ
+#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+#undef strtoull
unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
{
- unsigned long long int nb = strtouq(str, endptr, base);
- /* In linux EINVAL is only returned if base is not ok */
+ int errno0 = errno;
+ unsigned long long int nb = strtoull(str, endptr, base);
+ /* With glibc EINVAL is only returned if base is not ok */
if (errno == EINVAL) {
if (base == 0 || (base >1 && base <37)) {
/* Base was ok so it's because we were not
* able to make the convertion.
* Let's reset errno.
*/
- errno = 0;
+ errno = errno0;
}
}
return nb;
}
-#else
-#error "You need the strtouq function"
-#endif /* HAVE_STRTOUQ */
#endif /* HAVE_BSD_STRTOLL */
#endif /* HAVE_STRTOULL */