From: Paul Querna <pquerna@apache.org>
Date: Wed, 13 Jun 2007 02:18:59 +0000 (+0000)
Subject: Improve mc_session_id2sz as suggested by Rüdiger.
X-Git-Tag: 2.3.0~1771
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=670a501d7d310d20981281df828350af9843ecf5;p=thirdparty%2Fapache%2Fhttpd.git

Improve mc_session_id2sz as suggested by Rüdiger.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546708 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_scache_memcache.c b/modules/ssl/ssl_scache_memcache.c
index d7235d87eff..62ceaa38c24 100644
--- a/modules/ssl/ssl_scache_memcache.c
+++ b/modules/ssl/ssl_scache_memcache.c
@@ -168,13 +168,16 @@ static char *mc_session_id2sz(unsigned char *id, int idlen,
 {
     char *cp;
     int n;
- 
+    int maxlen = (strsize - MC_TAG_LEN)/2;
+
     cp = apr_cpystrn(str, MC_TAG, MC_TAG_LEN);
-    for (n = 0; n < idlen && n < (MC_KEY_LEN - MC_TAG_LEN); n++) {
-        apr_snprintf(cp, strsize - (cp-str), "%02X", id[n]);
+    for (n = 0; n < idlen && n < maxlen; n++) {
+        apr_snprintf(cp, 2, "%02X", id[n]);
         cp += 2;
     }
+
     *cp = '\0';
+
     return str;
 }