svn commit: r1936837 - apr/apr/trunk/xlate
[email protected] Mon, 03 Aug 2026 14:46:37 -0000
| Newsgroups | gmane.comp.apache.apr.cvs |
|---|---|
| Message-ID | <178576839718.1885489.16849819930949927354@svn03-he-fi> |
Author: covener
Date: Mon Aug 3 14:46:36 2026
New Revision: 1936837
Log:
avoid NULL inbytesleft directly to system iconv
long ignored AIX testxlate failure
Modified:
apr/apr/trunk/xlate/xlate.c
Modified: apr/apr/trunk/xlate/xlate.c
==============================================================================
--- apr/apr/trunk/xlate/xlate.c Mon Aug 3 14:45:27 2026 (r1936836)
+++ apr/apr/trunk/xlate/xlate.c Mon Aug 3 14:46:36 2026 (r1936837)
@@ -288,8 +288,10 @@ APR_DECLARE(apr_status_t) apr_xlate_conv
const char *inbufptr = inbuf;
char *outbufptr = outbuf;
apr_size_t translated;
+ apr_size_t zero = 0;
+ apr_size_t *inbytes_ptr = inbytes_left ? inbytes_left : &zero;
translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
- inbytes_left, &outbufptr, outbytes_left);
+ inbytes_ptr, &outbufptr, outbytes_left);
/* If everything went fine but we ran out of buffer, don't
* report it as an error. Caller needs to look at the two