apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1842865 - in /apr/apr-util/branches/1.7.x: ./ dbd/apr_dbd_odbc.c
Date Fri, 05 Oct 2018 07:57:02 GMT
Author: jorton
Date: Fri Oct  5 07:57:02 2018
New Revision: 1842865

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

Untested but presumably this code was also -- found by Coverity:

* dbd/apr_dbd_odbc.c (odbc_lob_bucket_read): Fix to allocate
  sizeof(apr_bucket) not sizeof(apr_bucket *).


Modified:
    apr/apr-util/branches/1.7.x/   (props changed)
    apr/apr-util/branches/1.7.x/dbd/apr_dbd_odbc.c

Propchange: apr/apr-util/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  5 07:57:02 2018
@@ -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,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378,1772414,1778153,1781391,1782042,1782045,1788335,1789947,1809394,1811470,1820080,1825311,1833359,1833366,1833382,1833421,1833425-1833426,1833440,1833449-1833451,1833456,1
 833525,1833599,1833993,1833995,1834022-1834024,1834551,1835392,1836017,1836229,1836231,1836438
+/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,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378,1772414,1778153,1781391,1782042,1782045,1788335,1789947,1809394,1811470,1820080,1825311,1833359,1833366,1833382,1833421,1833425-1833426,1833440,1833449-1833451,1833456,1
 833525,1833599,1833993,1833995,1834022-1834024,1834551,1835392,1836017,1836229,1836231,1836438,1842824
 /apr/apr-util/branches/1.3.x:896410,1154885
 /apr/apr-util/branches/1.4.x:1126217,1211211,1211219,1211223,1211330
 /apr/apr-util/branches/1.5.x:1757430

Modified: apr/apr-util/branches/1.7.x/dbd/apr_dbd_odbc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/dbd/apr_dbd_odbc.c?rev=1842865&r1=1842864&r2=1842865&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/dbd/apr_dbd_odbc.c (original)
+++ apr/apr-util/branches/1.7.x/dbd/apr_dbd_odbc.c Fri Oct  5 07:57:02 2018
@@ -704,7 +704,7 @@ static apr_status_t odbc_lob_bucket_read
 
         if (!eos) {
             /* Create a new LOB bucket to append and append it */
-            nxt = apr_bucket_alloc(sizeof(apr_bucket *), e->list);
+            nxt = apr_bucket_alloc(sizeof *nxt, e->list);
             APR_BUCKET_INIT(nxt);
             nxt->length = -1;
             nxt->data   = e->data;



Mime
View raw message