[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r1782047 - in /apr/apr-util/branches/1.5.x: ./ memcache/apr_memcache.c
From:       ylavic () apache ! org
Date:       2017-02-07 18:37:54
Message-ID: 20170207183754.91D103A0F9E () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: ylavic
Date: Tue Feb  7 18:37:54 2017
New Revision: 1782047

URL: http://svn.apache.org/viewvc?rev=1782047&view=rev
Log:
Merge r1782045 from trunk.

apr_memcache: reserve buffer space for trailing \0.

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/memcache/apr_memcache.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  7 18:37:54 2017
@@ -1,4 +1,4 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409, \
998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516 \
,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,13579 \
68,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,137 \
0626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1 \
402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314 \
,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,15162 \
61,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1751806,1751898,1772414,1776994,1776998
 +/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409 \
,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,121451 \
6,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357 \
968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,13 \
70626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870, \
1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,144931 \
4,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516 \
261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,16 \
48830,1711657,1722547,1728958,1728963,1751806,1751898,1772414,1776994,1776998,1782045 \
/apr/apr-util/branches/1.3.x:896410,1154885  \
/apr/apr-util/branches/1.4.x:1126217,1211211,1211219,1211223,1211330  \
/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630,1626561


Modified: apr/apr-util/branches/1.5.x/memcache/apr_memcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/memcache/apr_memcache.c?rev=1782047&r1=1782046&r2=1782047&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/memcache/apr_memcache.c (original)
+++ apr/apr-util/branches/1.5.x/memcache/apr_memcache.c Tue Feb  7 18:37:54 2017
@@ -356,7 +356,7 @@ mc_conn_construct(void **conn_, void *pa
         return rv;
     }
 
-    conn->buffer = apr_palloc(conn->p, BUFFER_SIZE);
+    conn->buffer = apr_palloc(conn->p, BUFFER_SIZE + 1);
     conn->blen = 0;
     conn->ms = ms;
 


[prev in list] [next in list] [prev in thread] [next in thread]