comparison Python/sysmodule.c @ 41470:31c92828aefb legacy-trunk

SF #1701207, Fix bogus assertion (and test it!)
author Neal Norwitz <nnorwitz@gmail.com>
date Mon, 16 Apr 2007 07:37:55 +0000
parents 86ab2f20a333
children d44fffda2cd0
comparison
equal deleted inserted replaced
41463:5f8a87fb4df3 41470:31c92828aefb
995 strcpy(shortbranch, "trunk"); 995 strcpy(shortbranch, "trunk");
996 996
997 } 997 }
998 else if (istag || strncmp(br_start, "branches", 8) == 0) { 998 else if (istag || strncmp(br_start, "branches", 8) == 0) {
999 len = br_end2 - br_start; 999 len = br_end2 - br_start;
1000 assert(len >= 13);
1001 assert(len < (sizeof(patchlevel_revision) - 13));
1002 strncpy(branch, br_start, len); 1000 strncpy(branch, br_start, len);
1003 branch[len] = '\0'; 1001 branch[len] = '\0';
1004 1002
1005 len = br_end2 - (br_end + 1); 1003 len = br_end2 - (br_end + 1);
1006 strncpy(shortbranch, br_end + 1, len); 1004 strncpy(shortbranch, br_end + 1, len);
1015 svnversion = _Py_svnversion(); 1013 svnversion = _Py_svnversion();
1016 if (strcmp(svnversion, "exported") != 0) 1014 if (strcmp(svnversion, "exported") != 0)
1017 svn_revision = svnversion; 1015 svn_revision = svnversion;
1018 else if (istag) { 1016 else if (istag) {
1019 len = strlen(_patchlevel_revision); 1017 len = strlen(_patchlevel_revision);
1018 assert(len >= 13);
1019 assert(len < (sizeof(patchlevel_revision) + 13));
1020 strncpy(patchlevel_revision, _patchlevel_revision + 11, 1020 strncpy(patchlevel_revision, _patchlevel_revision + 11,
1021 len - 13); 1021 len - 13);
1022 patchlevel_revision[len - 13] = '\0'; 1022 patchlevel_revision[len - 13] = '\0';
1023 svn_revision = patchlevel_revision; 1023 svn_revision = patchlevel_revision;
1024 } 1024 }