You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2012/03/08 05:01:23 UTC
svn commit: r1298264 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/props.c
Author: svn-role
Date: Thu Mar 8 04:01:23 2012
New Revision: 1298264
URL: http://svn.apache.org/viewvc?rev=1298264&view=rev
Log:
Merge r1296369 from trunk:
* r1296369
Fix an off-by-one memory access.
Votes:
+1: danielsh, philip, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/props.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 8 04:01:23 2012
@@ -80,4 +80,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk: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,115
5404,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,1176949,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,1202132,1202135,1202187,1202333,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,1210147,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,12137
16,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,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,1230714,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1243976,1244303,1244317,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291680,1291685,1291700,1291704,1291726,1291729,1291941,1292090,1292248,1292255,1292260,1292296,1292322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1294470,1295303
+/subversion/trunk: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,115
5404,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,1176949,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,1202132,1202135,1202187,1202333,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,1210147,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,12137
16,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,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,1230714,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1243976,1244303,1244317,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291680,1291685,1291700,1291704,1291726,1291729,1291941,1292090,1292248,1292255,1292260,1292296,1292322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1294470,1295303,1296369
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1298264&r1=1298263&r2=1298264&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Mar 8 04:01:23 2012
@@ -121,8 +121,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1296369
- Fix an off-by-one memory access.
- Votes:
- +1: danielsh, philip, rhuijben
-
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/props.c?rev=1298264&r1=1298263&r2=1298264&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/props.c Thu Mar 8 04:01:23 2012
@@ -2537,7 +2537,8 @@ svn_wc_canonicalize_svn_prop(const svn_s
|| strcmp(propname, SVN_PROP_EXTERNALS) == 0)
{
/* Make sure that the last line ends in a newline */
- if (propval->data[propval->len - 1] != '\n')
+ if (propval->len == 0
+ || propval->data[propval->len - 1] != '\n')
{
new_value = svn_stringbuf_create_from_string(propval, pool);
svn_stringbuf_appendbyte(new_value, '\n');
Re: svn commit: r1298264 - in /subversion/branches/1.7.x: ./
STATUS subversion/libsvn_wc/props.c
Posted by Daniel Shahaf <da...@elego.de>.
Bert Huijben wrote on Thu, Mar 08, 2012 at 10:38:16 +0100:
>
>
> > -----Original Message-----
> > From: svn-role@apache.org [mailto:svn-role@apache.org]
> > Sent: donderdag 8 maart 2012 5:01
> > To: commits@subversion.apache.org
> > Subject: svn commit: r1298264 - in /subversion/branches/1.7.x: ./ STATUS
> > subversion/libsvn_wc/props.c
> >
> > Author: svn-role
> > Date: Thu Mar 8 04:01:23 2012
> > New Revision: 1298264
> >
>
> > Modified: subversion/branches/1.7.x/subversion/libsvn_wc/props.c
> > URL:
> > http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc
> > /props.c?rev=1298264&r1=1298263&r2=1298264&view=diff
> > =============================================================
> > =================
> > --- subversion/branches/1.7.x/subversion/libsvn_wc/props.c (original)
> > +++ subversion/branches/1.7.x/subversion/libsvn_wc/props.c Thu Mar 8
> > 04:01:23 2012
> > @@ -2537,7 +2537,8 @@ svn_wc_canonicalize_svn_prop(const svn_s
> > || strcmp(propname, SVN_PROP_EXTERNALS) == 0)
> > {
> > /* Make sure that the last line ends in a newline */
> > - if (propval->data[propval->len - 1] != '\n')
> > + if (propval->len == 0
> > + || propval->data[propval->len - 1] != '\n')
> > {
> > new_value = svn_stringbuf_create_from_string(propval, pool);
> > svn_stringbuf_appendbyte(new_value, '\n');
>
> Looking at this patch again at a better hour:
>
> Why do we add a '\n' to a 0-byte property value.
>
> I think it should be 'propval->len > 0 && ...'
>
> Bert
>
I assume the preexisting code appended a newline byte to empty property
values (though perhaps unintentionally), and the new code preserves this
behaviour. I don't know if ("", 0) v. ("\n", 1) makes a difference to
the rest of the code.
Re: svn commit: r1298264 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/props.c
Posted by Philip Martin <ph...@wandisco.com>.
"Bert Huijben" <be...@qqmail.nl> writes:
>> -----Original Message-----
>> From: svn-role@apache.org [mailto:svn-role@apache.org]
>> Sent: donderdag 8 maart 2012 5:01
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1298264 - in /subversion/branches/1.7.x: ./ STATUS
>> subversion/libsvn_wc/props.c
>>
>> Author: svn-role
>> Date: Thu Mar 8 04:01:23 2012
>> New Revision: 1298264
>>
>
>> Modified: subversion/branches/1.7.x/subversion/libsvn_wc/props.c
>> URL:
>> http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc
>> /props.c?rev=1298264&r1=1298263&r2=1298264&view=diff
>> =============================================================
>> =================
>> --- subversion/branches/1.7.x/subversion/libsvn_wc/props.c (original)
>> +++ subversion/branches/1.7.x/subversion/libsvn_wc/props.c Thu Mar 8
>> 04:01:23 2012
>> @@ -2537,7 +2537,8 @@ svn_wc_canonicalize_svn_prop(const svn_s
>> || strcmp(propname, SVN_PROP_EXTERNALS) == 0)
>> {
>> /* Make sure that the last line ends in a newline */
>> - if (propval->data[propval->len - 1] != '\n')
>> + if (propval->len == 0
>> + || propval->data[propval->len - 1] != '\n')
>> {
>> new_value = svn_stringbuf_create_from_string(propval, pool);
>> svn_stringbuf_appendbyte(new_value, '\n');
>
> Looking at this patch again at a better hour:
>
> Why do we add a '\n' to a 0-byte property value.
>
> I think it should be 'propval->len > 0 && ...'
Perhaps. The original code would either leave '' as '' or change it to
'\n' depending on the value of data[-1]. I suppose it is possible that
data[-1] is outside valid memory and the original code might SEGV but
usually date[-1] is in valid memory, it's just not part of the string,
and so the result is sort of random. The client library seems to be
happy with either a '' or '\n' result.
If we assume that the most common case is that data[-1] != '\n' then the
most common case would be to convert '' to '\n' and the new code
preserves the most common behaviour.
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
RE: svn commit: r1298264 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/props.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: svn-role@apache.org [mailto:svn-role@apache.org]
> Sent: donderdag 8 maart 2012 5:01
> To: commits@subversion.apache.org
> Subject: svn commit: r1298264 - in /subversion/branches/1.7.x: ./ STATUS
> subversion/libsvn_wc/props.c
>
> Author: svn-role
> Date: Thu Mar 8 04:01:23 2012
> New Revision: 1298264
>
> Modified: subversion/branches/1.7.x/subversion/libsvn_wc/props.c
> URL:
> http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc
> /props.c?rev=1298264&r1=1298263&r2=1298264&view=diff
> =============================================================
> =================
> --- subversion/branches/1.7.x/subversion/libsvn_wc/props.c (original)
> +++ subversion/branches/1.7.x/subversion/libsvn_wc/props.c Thu Mar 8
> 04:01:23 2012
> @@ -2537,7 +2537,8 @@ svn_wc_canonicalize_svn_prop(const svn_s
> || strcmp(propname, SVN_PROP_EXTERNALS) == 0)
> {
> /* Make sure that the last line ends in a newline */
> - if (propval->data[propval->len - 1] != '\n')
> + if (propval->len == 0
> + || propval->data[propval->len - 1] != '\n')
> {
> new_value = svn_stringbuf_create_from_string(propval, pool);
> svn_stringbuf_appendbyte(new_value, '\n');
Looking at this patch again at a better hour:
Why do we add a '\n' to a 0-byte property value.
I think it should be 'propval->len > 0 && ...'
Bert