Fossil SCM
Fix an assertion failure.
Commit
d3625bd9c4a96c4906df0a14588153f0212241f8a024167241a100129b1f26e4
Parent
c7749bb0a397c8e…
1 file changed
+2
-3
+2
-3
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -177,13 +177,12 @@ | ||
| 177 | 177 | " SELECT * FROM par WHERE ex=%d ORDER BY cnt DESC LIMIT 1", |
| 178 | 178 | TAG_BRANCH, zBr, ans, TAG_BRANCH, zBr, eType%2 |
| 179 | 179 | ); |
| 180 | 180 | fossil_free(zBr); |
| 181 | 181 | rc = db_step(&q); |
| 182 | - if( rc!=SQLITE_ROW ) return ans; | |
| 183 | - | |
| 184 | - ans = db_column_int(&q, 0); | |
| 182 | + if( rc==SQLITE_ROW ) | |
| 183 | + ans = db_column_int(&q, 0); | |
| 185 | 184 | db_finalize(&q); |
| 186 | 185 | if( eType==2 && ans>0 ){ |
| 187 | 186 | zBr = branch_of_rid(ans); |
| 188 | 187 | ans = compute_youngest_ancestor_in_branch(rid, zBr); |
| 189 | 188 | fossil_free(zBr); |
| 190 | 189 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -177,13 +177,12 @@ | |
| 177 | " SELECT * FROM par WHERE ex=%d ORDER BY cnt DESC LIMIT 1", |
| 178 | TAG_BRANCH, zBr, ans, TAG_BRANCH, zBr, eType%2 |
| 179 | ); |
| 180 | fossil_free(zBr); |
| 181 | rc = db_step(&q); |
| 182 | if( rc!=SQLITE_ROW ) return ans; |
| 183 | |
| 184 | ans = db_column_int(&q, 0); |
| 185 | db_finalize(&q); |
| 186 | if( eType==2 && ans>0 ){ |
| 187 | zBr = branch_of_rid(ans); |
| 188 | ans = compute_youngest_ancestor_in_branch(rid, zBr); |
| 189 | fossil_free(zBr); |
| 190 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -177,13 +177,12 @@ | |
| 177 | " SELECT * FROM par WHERE ex=%d ORDER BY cnt DESC LIMIT 1", |
| 178 | TAG_BRANCH, zBr, ans, TAG_BRANCH, zBr, eType%2 |
| 179 | ); |
| 180 | fossil_free(zBr); |
| 181 | rc = db_step(&q); |
| 182 | if( rc==SQLITE_ROW ) |
| 183 | ans = db_column_int(&q, 0); |
| 184 | db_finalize(&q); |
| 185 | if( eType==2 && ans>0 ){ |
| 186 | zBr = branch_of_rid(ans); |
| 187 | ans = compute_youngest_ancestor_in_branch(rid, zBr); |
| 188 | fossil_free(zBr); |
| 189 |