Fossil SCM
More missing calls to db_unprotect().
Commit
3ced48bdf815b96aefe675809b62b38cdac11ad84df5b5bfe3fd92e89dec75db
Parent
2041072e8d04927…
1 file changed
+4
+4
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -438,11 +438,13 @@ | ||
| 438 | 438 | blob_append_sql(&sql,") VALUES(%s,%s", |
| 439 | 439 | azToken[1] /*safe-for-%s*/, azToken[0]/*safe-for-%s*/); |
| 440 | 440 | for(jj=2; jj<nToken; jj+=2){ |
| 441 | 441 | blob_append_sql(&sql, ",%s", azToken[jj+1] /*safe-for-%s*/); |
| 442 | 442 | } |
| 443 | + db_unprotect(PROTECT_ALL); | |
| 443 | 444 | db_multi_exec("%s)", blob_sql_text(&sql)); |
| 445 | + db_protect_pop(); | |
| 444 | 446 | if( db_changes()==0 ){ |
| 445 | 447 | blob_reset(&sql); |
| 446 | 448 | blob_append_sql(&sql, "UPDATE \"%w\" SET mtime=%s", |
| 447 | 449 | &zName[1], azToken[0]/*safe-for-%s*/); |
| 448 | 450 | for(jj=2; jj<nToken; jj+=2){ |
| @@ -450,11 +452,13 @@ | ||
| 450 | 452 | azToken[jj], azToken[jj+1]/*safe-for-%s*/); |
| 451 | 453 | } |
| 452 | 454 | blob_append_sql(&sql, " WHERE \"%w\"=%s AND mtime<%s", |
| 453 | 455 | aType[ii].zPrimKey, azToken[1]/*safe-for-%s*/, |
| 454 | 456 | azToken[0]/*safe-for-%s*/); |
| 457 | + db_unprotect(PROTECT_ALL); | |
| 455 | 458 | db_multi_exec("%s", blob_sql_text(&sql)); |
| 459 | + db_protect_pop(); | |
| 456 | 460 | } |
| 457 | 461 | blob_reset(&sql); |
| 458 | 462 | rebuildMask |= thisMask; |
| 459 | 463 | } |
| 460 | 464 | } |
| 461 | 465 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -438,11 +438,13 @@ | |
| 438 | blob_append_sql(&sql,") VALUES(%s,%s", |
| 439 | azToken[1] /*safe-for-%s*/, azToken[0]/*safe-for-%s*/); |
| 440 | for(jj=2; jj<nToken; jj+=2){ |
| 441 | blob_append_sql(&sql, ",%s", azToken[jj+1] /*safe-for-%s*/); |
| 442 | } |
| 443 | db_multi_exec("%s)", blob_sql_text(&sql)); |
| 444 | if( db_changes()==0 ){ |
| 445 | blob_reset(&sql); |
| 446 | blob_append_sql(&sql, "UPDATE \"%w\" SET mtime=%s", |
| 447 | &zName[1], azToken[0]/*safe-for-%s*/); |
| 448 | for(jj=2; jj<nToken; jj+=2){ |
| @@ -450,11 +452,13 @@ | |
| 450 | azToken[jj], azToken[jj+1]/*safe-for-%s*/); |
| 451 | } |
| 452 | blob_append_sql(&sql, " WHERE \"%w\"=%s AND mtime<%s", |
| 453 | aType[ii].zPrimKey, azToken[1]/*safe-for-%s*/, |
| 454 | azToken[0]/*safe-for-%s*/); |
| 455 | db_multi_exec("%s", blob_sql_text(&sql)); |
| 456 | } |
| 457 | blob_reset(&sql); |
| 458 | rebuildMask |= thisMask; |
| 459 | } |
| 460 | } |
| 461 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -438,11 +438,13 @@ | |
| 438 | blob_append_sql(&sql,") VALUES(%s,%s", |
| 439 | azToken[1] /*safe-for-%s*/, azToken[0]/*safe-for-%s*/); |
| 440 | for(jj=2; jj<nToken; jj+=2){ |
| 441 | blob_append_sql(&sql, ",%s", azToken[jj+1] /*safe-for-%s*/); |
| 442 | } |
| 443 | db_unprotect(PROTECT_ALL); |
| 444 | db_multi_exec("%s)", blob_sql_text(&sql)); |
| 445 | db_protect_pop(); |
| 446 | if( db_changes()==0 ){ |
| 447 | blob_reset(&sql); |
| 448 | blob_append_sql(&sql, "UPDATE \"%w\" SET mtime=%s", |
| 449 | &zName[1], azToken[0]/*safe-for-%s*/); |
| 450 | for(jj=2; jj<nToken; jj+=2){ |
| @@ -450,11 +452,13 @@ | |
| 452 | azToken[jj], azToken[jj+1]/*safe-for-%s*/); |
| 453 | } |
| 454 | blob_append_sql(&sql, " WHERE \"%w\"=%s AND mtime<%s", |
| 455 | aType[ii].zPrimKey, azToken[1]/*safe-for-%s*/, |
| 456 | azToken[0]/*safe-for-%s*/); |
| 457 | db_unprotect(PROTECT_ALL); |
| 458 | db_multi_exec("%s", blob_sql_text(&sql)); |
| 459 | db_protect_pop(); |
| 460 | } |
| 461 | blob_reset(&sql); |
| 462 | rebuildMask |= thisMask; |
| 463 | } |
| 464 | } |
| 465 |