Kaydet (Commit) 68cdf8a6 authored tarafından Neal Norwitz's avatar Neal Norwitz

SF #1701207, Fix bogus assertion (and test it!)

üst cbd9ee69
...@@ -997,8 +997,6 @@ svnversion_init(void) ...@@ -997,8 +997,6 @@ svnversion_init(void)
} }
else if (istag || strncmp(br_start, "branches", 8) == 0) { else if (istag || strncmp(br_start, "branches", 8) == 0) {
len = br_end2 - br_start; len = br_end2 - br_start;
assert(len >= 13);
assert(len < (sizeof(patchlevel_revision) - 13));
strncpy(branch, br_start, len); strncpy(branch, br_start, len);
branch[len] = '\0'; branch[len] = '\0';
...@@ -1017,6 +1015,8 @@ svnversion_init(void) ...@@ -1017,6 +1015,8 @@ svnversion_init(void)
svn_revision = svnversion; svn_revision = svnversion;
else if (istag) { else if (istag) {
len = strlen(_patchlevel_revision); len = strlen(_patchlevel_revision);
assert(len >= 13);
assert(len < (sizeof(patchlevel_revision) + 13));
strncpy(patchlevel_revision, _patchlevel_revision + 11, strncpy(patchlevel_revision, _patchlevel_revision + 11,
len - 13); len - 13);
patchlevel_revision[len - 13] = '\0'; patchlevel_revision[len - 13] = '\0';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment