]> granicus.if.org Git - python/commitdiff
SF #1701207, Fix bogus assertion (and test it!)
authorNeal Norwitz <nnorwitz@gmail.com>
Mon, 16 Apr 2007 07:37:55 +0000 (07:37 +0000)
committerNeal Norwitz <nnorwitz@gmail.com>
Mon, 16 Apr 2007 07:37:55 +0000 (07:37 +0000)
Python/sysmodule.c

index 59f6cfc684d52bf4bc676942af12fc75e02d1f21..774a7db89b5c36ad67a8eb30132327acf0f4a024 100644 (file)
@@ -997,8 +997,6 @@ svnversion_init(void)
        }
        else if (istag || strncmp(br_start, "branches", 8) == 0) {
                len = br_end2 - br_start;
-               assert(len >= 13);
-               assert(len < (sizeof(patchlevel_revision) - 13));
                strncpy(branch, br_start, len);
                branch[len] = '\0';
 
@@ -1017,6 +1015,8 @@ svnversion_init(void)
                svn_revision = svnversion;
        else if (istag) {
                len = strlen(_patchlevel_revision);
+               assert(len >= 13);
+               assert(len < (sizeof(patchlevel_revision) + 13));
                strncpy(patchlevel_revision, _patchlevel_revision + 11,
                        len - 13);
                patchlevel_revision[len - 13] = '\0';