Merge 1781509 from trunk:

htpasswd: don't point to (unused) stack memory on output
to make static analysers happy.  PR 60634.

Submitted by: rjung
Reviewed by: rjung, ylavic, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826886 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f62ef5dfee1d2adc0d160ea551fb625c7af67357..51bc9948bce4d67d68c6b2d63ef41112922802c2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.33
 
+  *) htpasswd: don't point to (unused) stack memory on output
+     to make static analysers happy.  PR 60634.
+     [Yann Ylavic, reported by shqking and Zhenwei Zou]
+
   *) ab: LibreSSL doesn't have or require Windows applink.c.  [Gregg L. Smith]
 
 Changes with Apache 2.4.32

diff --git a/STATUS b/STATUS
index eaaa95de3a84077007dbaba9758e512111699976..dc5786401160ea10b5da5525d2a8375ba49521ad 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -126,13 +126,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1826686 ^/httpd/httpd/trunk .
      +1: jailletc36, ylavic, covener
 
-  *) htpasswd: don't point to (unused) stack memory on output
-     to make static analysers happy.  PR 60634.
-     trunk patch: http://svn.apache.org/r1781509
-     2.4.x patch: svn merge -c 1781509 ^/httpd/httpd/trunk .
-                  plus CHANGES
-     +1: rjung, ylavic, covener
-
   *) htpasswd: Don't fail in -v mode if password file is unwritable.
      PR 61631.
      This brings 2.4.x htpasswd in sync with trunk.

diff --git a/support/htpasswd.c b/support/htpasswd.c
index 93308d8e93c7ac6d71d2c998c2fce1e495d6682a..65a0b9c3bba90028e631c1cd27f8307cfabf448f 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -75,15 +75,20 @@ static int mkrecord(struct passwd_ctx *ctx, char *user)
 {
     char hash_str[MAX_STRING_LEN];
     int ret;
+
     ctx->out = hash_str;
     ctx->out_len = sizeof(hash_str);
 
     ret = mkhash(ctx);
-    if (ret)
+    if (ret) {
+        ctx->out = NULL;
+        ctx->out_len = 0;
         return ret;
+    }
 
     ctx->out = apr_pstrcat(ctx->pool, user, ":", hash_str, NL, NULL);
-    if (strlen(ctx->out) >= MAX_STRING_LEN) {
+    ctx->out_len = strlen(ctx->out);
+    if (ctx->out_len >= MAX_STRING_LEN) {
         ctx->errstr = "resultant record too long";
         return ERR_OVERFLOW;
     }