Fossil

Check-in [612e0ecc]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:612e0ecc2500e966742dc4b755d4a00ac8380710
User & Date: stephan 2013-09-02 19:20:13
Context
2013-09-03
15:24
Update the built-in SQLite from upstream, for the purpose of testing SQLite. check-in: fa0df0c7 user: drh tags: trunk
2013-09-02
19:20
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. check-in: 612e0ecc user: stephan tags: trunk
19:11
Removed some dead SQL code and fixed transaction closing in a "cannot happen" scenario in load_vfile_from_rid(), per ML discussion. check-in: 3e9f9b06 user: stephan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/vfile.c.

95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
  db_bind_int(&ins, ":vid", vid);
  manifest_file_rewind(p);
  while( (pFile = manifest_file_next(p,0))!=0 ){
    if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue;
    db_bind_text(&ridq, ":uuid", pFile->zUuid);
    if( db_step(&ridq)==SQLITE_ROW ){
      rid = db_column_int(&ridq, 0);
      size = db_column_int(&ridq, 0);
    }else{
      rid = 0;
      size = 0;
    }
    db_reset(&ridq);
    if( rid==0 || size<0 ){
      fossil_warning("content missing for %s", pFile->zName);







|







95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
  db_bind_int(&ins, ":vid", vid);
  manifest_file_rewind(p);
  while( (pFile = manifest_file_next(p,0))!=0 ){
    if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue;
    db_bind_text(&ridq, ":uuid", pFile->zUuid);
    if( db_step(&ridq)==SQLITE_ROW ){
      rid = db_column_int(&ridq, 0);
      size = db_column_int(&ridq, 1);
    }else{
      rid = 0;
      size = 0;
    }
    db_reset(&ridq);
    if( rid==0 || size<0 ){
      fossil_warning("content missing for %s", pFile->zName);