Fossil SCM
Fix another NULL pointer deref associated with delta manifests.
Commit
315048eef6b32c8035de7a5fe6de3642b6db8e7f
Parent
a35e8c0db14c09a…
1 file changed
+1
+1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -535,10 +535,11 @@ | ||
| 535 | 535 | if( pManifest==0 ){ |
| 536 | 536 | fossil_panic("manifest file (%d) is malformed", vid); |
| 537 | 537 | } |
| 538 | 538 | manifest_file_rewind(pManifest); |
| 539 | 539 | while( (pFile = manifest_file_next(pManifest,0))!=0 ){ |
| 540 | + if( pFile->zUuid==0 ) continue; | |
| 540 | 541 | fid = uuid_to_rid(pFile->zUuid, 0); |
| 541 | 542 | md5sum_step_text(pFile->zName, -1); |
| 542 | 543 | content_get(fid, &file); |
| 543 | 544 | sqlite3_snprintf(sizeof(zBuf), zBuf, " %d\n", blob_size(&file)); |
| 544 | 545 | md5sum_step_text(zBuf, -1); |
| 545 | 546 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -535,10 +535,11 @@ | |
| 535 | if( pManifest==0 ){ |
| 536 | fossil_panic("manifest file (%d) is malformed", vid); |
| 537 | } |
| 538 | manifest_file_rewind(pManifest); |
| 539 | while( (pFile = manifest_file_next(pManifest,0))!=0 ){ |
| 540 | fid = uuid_to_rid(pFile->zUuid, 0); |
| 541 | md5sum_step_text(pFile->zName, -1); |
| 542 | content_get(fid, &file); |
| 543 | sqlite3_snprintf(sizeof(zBuf), zBuf, " %d\n", blob_size(&file)); |
| 544 | md5sum_step_text(zBuf, -1); |
| 545 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -535,10 +535,11 @@ | |
| 535 | if( pManifest==0 ){ |
| 536 | fossil_panic("manifest file (%d) is malformed", vid); |
| 537 | } |
| 538 | manifest_file_rewind(pManifest); |
| 539 | while( (pFile = manifest_file_next(pManifest,0))!=0 ){ |
| 540 | if( pFile->zUuid==0 ) continue; |
| 541 | fid = uuid_to_rid(pFile->zUuid, 0); |
| 542 | md5sum_step_text(pFile->zName, -1); |
| 543 | content_get(fid, &file); |
| 544 | sqlite3_snprintf(sizeof(zBuf), zBuf, " %d\n", blob_size(&file)); |
| 545 | md5sum_step_text(zBuf, -1); |
| 546 |