diff mbox

[1/1] icu: fix build-time segfault by backporting upstream fix

Message ID 1455725382-32751-1-git-send-email-mr.zoltan.gyarmati@gmail.com
State Accepted
Commit ef557e0d28a59c251f693acc8d7452e66d7483fa
Headers show

Commit Message

Zoltan Gyarmati Feb. 17, 2016, 4:09 p.m. UTC 
The icu bug http://bugs.icu-project.org/trac/ticket/11959 also
hit me, but oddly enough only when running build build server via
Jenkins. This patch adds the upstream fix for the mentioned bug, so the
patch most likely can be removed at the next version bump.

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 ...llocating-memory-for-pkgDataFlags.-compil.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch

Comments

Peter Korsgaard Feb. 17, 2016, 9:10 p.m. UTC | #1 
>>>>> "Zoltan" == Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> writes:

 > The icu bug http://bugs.icu-project.org/trac/ticket/11959 also
 > hit me, but oddly enough only when running build build server via
 > Jenkins. This patch adds the upstream fix for the mentioned bug, so the
 > patch most likely can be removed at the next version bump.

 > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>

Committed, thanks.
diff mbox

Patch

diff --git a/package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch b/package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch
new file mode 100644
index 0000000..d53a761
--- /dev/null
+++ b/package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch
@@ -0,0 +1,34 @@ 
+From 212016f27dd581fd7bef1a44a3342c59619a4ec8 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Wed, 27 Jan 2016 17:24:25 +0100
+Subject: [PATCH] fix "Error allocating memory for pkgDataFlags." compilation
+ error
+
+ This is backport of the upstream icu commit 38081
+(http://bugs.icu-project.org/trac/changeset/38081/icu/trunk), which is
+a fix to upstream icu bug #11959
+(http://bugs.icu-project.org/trac/ticket/11959)
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ source/tools/toolutil/flagparser.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/tools/toolutil/flagparser.c b/source/tools/toolutil/flagparser.c
+index 5543415..57256c3 100644
+--- a/source/tools/toolutil/flagparser.c
++++ b/source/tools/toolutil/flagparser.c
+@@ -96,8 +96,8 @@ parseFlagsFile_cleanup:
+     uprv_free(buffer);
+ 
+     T_FileStream_close(f);
+-    
+-    if (U_FAILURE(*status)) {
++
++    if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
+         return -1;
+     }
+ 
+-- 
+1.9.1
+