Fossil SCM
Fixed a wrong-column use in load_vfile_from_rid(), which caused an is-a-phantom check to always eval to false, even for phantoms. This has 'probably' never been triggered before.
Commit
612e0ecc2500e966742dc4b755d4a00ac8380710
Parent
3e9f9b0609095ff…
1 file changed
+1
-1
+1
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -97,11 +97,11 @@ | ||
| 97 | 97 | while( (pFile = manifest_file_next(p,0))!=0 ){ |
| 98 | 98 | if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue; |
| 99 | 99 | db_bind_text(&ridq, ":uuid", pFile->zUuid); |
| 100 | 100 | if( db_step(&ridq)==SQLITE_ROW ){ |
| 101 | 101 | rid = db_column_int(&ridq, 0); |
| 102 | - size = db_column_int(&ridq, 0); | |
| 102 | + size = db_column_int(&ridq, 1); | |
| 103 | 103 | }else{ |
| 104 | 104 | rid = 0; |
| 105 | 105 | size = 0; |
| 106 | 106 | } |
| 107 | 107 | db_reset(&ridq); |
| 108 | 108 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -97,11 +97,11 @@ | |
| 97 | while( (pFile = manifest_file_next(p,0))!=0 ){ |
| 98 | if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue; |
| 99 | db_bind_text(&ridq, ":uuid", pFile->zUuid); |
| 100 | if( db_step(&ridq)==SQLITE_ROW ){ |
| 101 | rid = db_column_int(&ridq, 0); |
| 102 | size = db_column_int(&ridq, 0); |
| 103 | }else{ |
| 104 | rid = 0; |
| 105 | size = 0; |
| 106 | } |
| 107 | db_reset(&ridq); |
| 108 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -97,11 +97,11 @@ | |
| 97 | while( (pFile = manifest_file_next(p,0))!=0 ){ |
| 98 | if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue; |
| 99 | db_bind_text(&ridq, ":uuid", pFile->zUuid); |
| 100 | if( db_step(&ridq)==SQLITE_ROW ){ |
| 101 | rid = db_column_int(&ridq, 0); |
| 102 | size = db_column_int(&ridq, 1); |
| 103 | }else{ |
| 104 | rid = 0; |
| 105 | size = 0; |
| 106 | } |
| 107 | db_reset(&ridq); |
| 108 |