apr: fix ptest hangs since enter non-terminating loop

ptest hangs in teststr since enter non-terminating loop,
fixed by a backport patch

(From OE-Core rev: daa496e7104e3f06bc5192bb4ec7d894b22dba5d)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changqing Li
2018-07-23 15:37:07 +08:00
committed by Richard Purdie
parent ae1dbbbfb5
commit fa23fa907b
2 changed files with 33 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 23 Jul 2018 14:12:35 +0800
Subject: [PATCH] apr: fix ptest hang in teststr
ptest hang in teststr since turns into a non-terminating loop,
fix by below backported patch.
Upstream-Status: Backport[https://github.com/apache/apr/commit/
2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
test/teststr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/teststr.c b/test/teststr.c
index d9a5054..951a830 100644
--- a/test/teststr.c
+++ b/test/teststr.c
@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data)
for (; off < 999999999; off += 999) {
apr_strfsize(off, buf);
}
- for (off = 1; off < LONG_MAX && off > 0; off *= 2) {
+ for (off = LONG_MAX; off > 1; off /= 2) {
apr_strfsize(off, buf);
apr_strfsize(off + 1, buf);
apr_strfsize(off - 1, buf);
--
2.7.4

View File

@@ -18,6 +18,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
file://0008-apr-fix-ptest-hang-in-teststr.patch \
"
SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa"