svn commit: r1936920 - in apr/apr-util/branches/1.6.x: . dbd

[rp...@apache.org]

Author: rpluem
Date: Thu Aug  6 13:41:32 2026
New Revision: 1936920

Log:
Merge r1936912 from trunk:

build break review from rpluem

patch by IBM Bob, still not compiled.

Submitted by: covener
Reviewed by: rpluem

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

Modified: apr/apr-util/branches/1.6.x/dbd/apr_dbd_oracle.c
==============================================================================
--- apr/apr-util/branches/1.6.x/dbd/apr_dbd_oracle.c	Thu Aug  6 13:40:35 2026	(r1936919)
+++ apr/apr-util/branches/1.6.x/dbd/apr_dbd_oracle.c	Thu Aug  6 13:41:32 2026	(r1936920)
@@ -852,15 +852,15 @@ static const char *dbd_oracle_escape(apr
     int qcount;
 
     /* return the original if there are no single-quotes */
-    if (!(sq = strchr(s, '\'')))
-        return (char *)s;
+    if (!(sq = strchr(arg, '\'')))
+        return (char *)arg;
     /* count the single-quotes and allocate a new buffer */
     for (qcount = 1; (sq = strchr(sq + 1, '\'')); )
         qcount++;
-    newstr = apr_palloc(pool, strlen(s) + qcount + 1);
+    newstr = apr_palloc(pool, strlen(arg) + qcount + 1);
 
     /* move chars, doubling all single-quotes */
-    src = (char *)s;
+    src = (char *)arg;
     for (dst = newstr; *src; src++) {
         if ((*dst++ = *src) == '\'')
             *dst++ = '\'';