svn commit: r1936839 - in apr/apr-util/branches/1.6.x: . xlate

Author: covener
Date: Mon Aug  3 14:50:47 2026
New Revision: 1936839

Log:
Merge r1936837 from apr trunk:

avoid NULL inbytesleft directly to system iconv

long ignored AIX testxlate failure

Modified:
   apr/apr-util/branches/1.6.x/   (props changed)
   apr/apr-util/branches/1.6.x/xlate/xlate.c

Modified: apr/apr-util/branches/1.6.x/xlate/xlate.c
==============================================================================
--- apr/apr-util/branches/1.6.x/xlate/xlate.c	Mon Aug  3 14:50:09 2026	(r1936838)
+++ apr/apr-util/branches/1.6.x/xlate/xlate.c	Mon Aug  3 14:50:47 2026	(r1936839)
@@ -340,8 +340,10 @@ APU_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