subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1242769 - in /subversion/branches/1.7.x: STATUS subversion/libsvn_subr/svn_base64.c
Date Fri, 10 Feb 2012 13:56:07 GMT
Author: hwright
Date: Fri Feb 10 13:56:07 2012
New Revision: 1242769

URL: http://svn.apache.org/viewvc?rev=1242769&view=rev
Log:
Subtree merge r1242337 from trunk to svn_base64.c:

 * r1242337
   Fix potential write beyond buffer during base64 decoding.
   Justification:
     Potential memory corruption, although much less likely than on trunk.
   Notes:
     Test won't compile but isn't necessary as it doesn't trigger the problem
     on 1.7.  Do a subtree merge of svn_base64.c.
   Votes:
     +1: philip, danielsh, rhuijben

Modified:
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c   (contents, props changed)

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1242769&r1=1242768&r2=1242769&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Feb 10 13:56:07 2012
@@ -104,16 +104,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1242337
-   Fix potential write beyond buffer during base64 decoding.
-   Justification:
-     Potential memory corruption, although much less likely than on trunk.
-   Notes:
-     Test won't compile but isn't necessary as it doesn't trigger the problem
-     on 1.7.  Do a subtree merge of svn_base64.c.
-   Votes:
-     +1: philip, danielsh, rhuijben
-
  * r1242537
    Skip 'svnrdump dump' tests over serf.
    Justification:

Modified: subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c?rev=1242769&r1=1242768&r2=1242769&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c Fri Feb 10 13:56:07 2012
@@ -407,10 +407,16 @@ decode_bytes(svn_stringbuf_t *str, const
   signed char find;
   const char *end = data + len;
 
-  /* Resize the stringbuf to make room for the (approximate) size of
-     output, to avoid repeated resizes later.
-     The optimizations in decode_line rely on no resizes being necessary! */
-  svn_stringbuf_ensure(str, str->len + (len / 4) * 3 + 3);
+  /* Resize the stringbuf to make room for the maximum size of output,
+     to avoid repeated resizes later.  The optimizations in
+     decode_line rely on no resizes being necessary!
+
+     (*inbuflen+len) is encoded data length
+     (*inbuflen+len)/4 is the number of complete 4-bytes sets
+     (*inbuflen+len)/4*3 is the number of decoded bytes
+     (*inbuflen+len)/4*3+1 is the number of decoded bytes plus a null
+  */
+  svn_stringbuf_ensure(str, str->len + ((*inbuflen + len) / 4) * 3 + 1);
 
   while ( !*done && p < end )
     {

Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 10 13:56:07 2012
@@ -0,0 +1,79 @@
+/subversion/1.7.x-issue4059/subversion/libsvn_subr/svn_base64.c:1239661-1239744
+/subversion/branches/1.5.x-r30215/subversion/libsvn_subr/svn_base64.c:870312
+/subversion/branches/1.7.x-JavaHL-pools/subversion/libsvn_subr/svn_base64.c:1158684-1158722
+/subversion/branches/1.7.x-issue3888/subversion/libsvn_subr/svn_base64.c:1148937-1149162
+/subversion/branches/1.7.x-issue3975/subversion/libsvn_subr/svn_base64.c:1160761-1161546
+/subversion/branches/1.7.x-issue3976/subversion/libsvn_subr/svn_base64.c:1161731-1165397
+/subversion/branches/1.7.x-issue4032/subversion/libsvn_subr/svn_base64.c:1186668-1186784
+/subversion/branches/1.7.x-issue4035/subversion/libsvn_subr/svn_base64.c:1186202-1186315
+/subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_subr/svn_base64.c:1186316-1186778
+/subversion/branches/1.7.x-issue4059/subversion/libsvn_subr/svn_base64.c:1239745-1242661
+/subversion/branches/1.7.x-issue4093/subversion/libsvn_subr/svn_base64.c:1229839-1230236
+/subversion/branches/1.7.x-issue4k/subversion/libsvn_subr/svn_base64.c:1166502-1167193
+/subversion/branches/1.7.x-neon-default/subversion/libsvn_subr/svn_base64.c:1148803-1158680
+/subversion/branches/1.7.x-r1152189/subversion/libsvn_subr/svn_base64.c:1152759-1154249
+/subversion/branches/1.7.x-r1155160/subversion/libsvn_subr/svn_base64.c:1158704-1159223
+/subversion/branches/1.7.x-r1159093/subversion/libsvn_subr/svn_base64.c:1159097-1159230
+/subversion/branches/1.7.x-r1163557/subversion/libsvn_subr/svn_base64.c:1163574-1170648
+/subversion/branches/1.7.x-r1173425/subversion/libsvn_subr/svn_base64.c:1173429-1176454
+/subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/svn_base64.c:1186224-1186351
+/subversion/branches/1.7.x-r1201824/subversion/libsvn_subr/svn_base64.c:1202121-1207333
+/subversion/branches/1.7.x-r1213331/subversion/libsvn_subr/svn_base64.c:1213684-1213756
+/subversion/branches/1.7.x-r1232221/subversion/libsvn_subr/svn_base64.c:1232358-1238008
+/subversion/branches/1.7.x-r1236343/subversion/libsvn_subr/svn_base64.c:1236628-1239394
+/subversion/branches/1.7.x-svn-patch-eol-fixes/subversion/libsvn_subr/svn_base64.c:1207511-1235924
+/subversion/branches/atomic-revprop/subversion/libsvn_subr/svn_base64.c:965046-1000689
+/subversion/branches/bdb-reverse-deltas/subversion/libsvn_subr/svn_base64.c:872050-872529
+/subversion/branches/diff-callbacks3/subversion/libsvn_subr/svn_base64.c:870059-870761
+/subversion/branches/diff-optimizations/subversion/libsvn_subr/svn_base64.c:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/svn_base64.c:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/libsvn_subr/svn_base64.c:870728-871118
+/subversion/branches/double-delete/subversion/libsvn_subr/svn_base64.c:870511-872970
+/subversion/branches/explore-wc/subversion/libsvn_subr/svn_base64.c:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/subversion/libsvn_subr/svn_base64.c:871779-873302
+/subversion/branches/fs-rep-sharing/subversion/libsvn_subr/svn_base64.c:869036-873803
+/subversion/branches/fsfs-pack/subversion/libsvn_subr/svn_base64.c:873717-874575
+/subversion/branches/gnome-keyring/subversion/libsvn_subr/svn_base64.c:870558-871410
+/subversion/branches/http-protocol-v2/subversion/libsvn_subr/svn_base64.c:874395-876041
+/subversion/branches/in-memory-cache/subversion/libsvn_subr/svn_base64.c:869829-871452
+/subversion/branches/integrate-cache-item-serialization/subversion/libsvn_subr/svn_base64.c:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion/libsvn_subr/svn_base64.c:998649-998852
+/subversion/branches/integrate-compression-level/subversion/libsvn_subr/svn_base64.c:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion/libsvn_subr/svn_base64.c:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion/libsvn_subr/svn_base64.c:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion/libsvn_subr/svn_base64.c:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion/libsvn_subr/svn_base64.c:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion/libsvn_subr/svn_base64.c:1068695-1072516
+/subversion/branches/integrate-txdelta-caching/subversion/libsvn_subr/svn_base64.c:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion/libsvn_subr/svn_base64.c:965496-984198
+/subversion/branches/issue-2843-dev/subversion/libsvn_subr/svn_base64.c:871432-874179
+/subversion/branches/issue-3000/subversion/libsvn_subr/svn_base64.c:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/svn_base64.c:873375-874084
+/subversion/branches/issue-3148-dev/subversion/libsvn_subr/svn_base64.c:875193-875204
+/subversion/branches/issue-3220-dev/subversion/libsvn_subr/svn_base64.c:872210-872226
+/subversion/branches/issue-3242-dev/subversion/libsvn_subr/svn_base64.c:879653-896436
+/subversion/branches/issue-3334-dirs/subversion/libsvn_subr/svn_base64.c:875156-875867
+/subversion/branches/issue-3975/subversion/libsvn_subr/svn_base64.c:1152931-1160746
+/subversion/branches/kwallet/subversion/libsvn_subr/svn_base64.c:870785-871314
+/subversion/branches/log-g-performance/subversion/libsvn_subr/svn_base64.c:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/libsvn_subr/svn_base64.c:874525-874615
+/subversion/branches/nfc-nfd-aware-client/subversion/libsvn_subr/svn_base64.c:870276,870376
+/subversion/branches/performance/subversion/libsvn_subr/svn_base64.c:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029
 336,1029339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/subversion/libsvn_subr/svn_base64.c:956579-1033052
+/subversion/branches/ra_serf-digest-authn/subversion/libsvn_subr/svn_base64.c:875693-876404
+/subversion/branches/reintegrate-improvements/subversion/libsvn_subr/svn_base64.c:873853-874164
+/subversion/branches/revprop-packing/subversion/libsvn_subr/svn_base64.c:1143907,1143971,1143997,1144017,1144499,1144568
+/subversion/branches/subtree-mergeinfo/subversion/libsvn_subr/svn_base64.c:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_subr/svn_base64.c:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/subversion/libsvn_subr/svn_base64.c:918519-934609
+/subversion/branches/svnpatch-diff/subversion/libsvn_subr/svn_base64.c:865738-876477
+/subversion/branches/svnraisetc/subversion/libsvn_subr/svn_base64.c:874709-875149
+/subversion/branches/svnserve-logging/subversion/libsvn_subr/svn_base64.c:869828-870893
+/subversion/branches/tc-issue-3334/subversion/libsvn_subr/svn_base64.c:874697-874773
+/subversion/branches/tc-merge-notify/subversion/libsvn_subr/svn_base64.c:874017-874062
+/subversion/branches/tc-resolve/subversion/libsvn_subr/svn_base64.c:874191-874239
+/subversion/branches/tc_url_rev/subversion/libsvn_subr/svn_base64.c:874351-874483
+/subversion/branches/tree-conflicts/subversion/libsvn_subr/svn_base64.c:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/libsvn_subr/svn_base64.c:873926-874008
+/subversion/branches/uris-as-urls/subversion/libsvn_subr/svn_base64.c:1060426-1064427
+/subversion/trunk/subversion/libsvn_subr/svn_base64.c:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131
 ,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176
 949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1
 213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240752,1241530,1241553,1241713,1241726,1242116,1242337



Mime
View raw message