Fossil SCM
Merge two branches that were created within one second of one another. There is a race condition in the anti-forking logic that allowed this fork to occur.
Commit
373e42de1d8eea8d95a1b41e106ae8bfab7a1926
Parent
ba433cc4fc2cf67…
2 files changed
+2
-3
+2
-2
+2
-3
| --- src/admin.c | ||
| +++ src/admin.c | ||
| @@ -63,13 +63,12 @@ | ||
| 63 | 63 | login_needed(); |
| 64 | 64 | return; |
| 65 | 65 | } |
| 66 | 66 | style_header("Admin SQL"); |
| 67 | 67 | @ <hr/><h2>SQL:</h2> |
| 68 | - @ <span class='achtung'>You can enter arbitrary SQL here, to execute | |
| 69 | - @ against the repo database. | |
| 70 | - @ With great power comes great responsibility...</span><br/> | |
| 68 | + @ You can enter only SELECT statements here, and some SQL-side functions | |
| 69 | + @ are also restricted.<br/> | |
| 71 | 70 | @ <form action='' method='post'> |
| 72 | 71 | @ <textarea style='border:2px solid black' name='sql' |
| 73 | 72 | @ cols='80' rows='5'>%h(zSql)</textarea> |
| 74 | 73 | @ <br/><input type='submit' name='sql_submit'/> <input type='reset'/> |
| 75 | 74 | @ </form> |
| 76 | 75 |
| --- src/admin.c | |
| +++ src/admin.c | |
| @@ -63,13 +63,12 @@ | |
| 63 | login_needed(); |
| 64 | return; |
| 65 | } |
| 66 | style_header("Admin SQL"); |
| 67 | @ <hr/><h2>SQL:</h2> |
| 68 | @ <span class='achtung'>You can enter arbitrary SQL here, to execute |
| 69 | @ against the repo database. |
| 70 | @ With great power comes great responsibility...</span><br/> |
| 71 | @ <form action='' method='post'> |
| 72 | @ <textarea style='border:2px solid black' name='sql' |
| 73 | @ cols='80' rows='5'>%h(zSql)</textarea> |
| 74 | @ <br/><input type='submit' name='sql_submit'/> <input type='reset'/> |
| 75 | @ </form> |
| 76 |
| --- src/admin.c | |
| +++ src/admin.c | |
| @@ -63,13 +63,12 @@ | |
| 63 | login_needed(); |
| 64 | return; |
| 65 | } |
| 66 | style_header("Admin SQL"); |
| 67 | @ <hr/><h2>SQL:</h2> |
| 68 | @ You can enter only SELECT statements here, and some SQL-side functions |
| 69 | @ are also restricted.<br/> |
| 70 | @ <form action='' method='post'> |
| 71 | @ <textarea style='border:2px solid black' name='sql' |
| 72 | @ cols='80' rows='5'>%h(zSql)</textarea> |
| 73 | @ <br/><input type='submit' name='sql_submit'/> <input type='reset'/> |
| 74 | @ </form> |
| 75 |
+2
-2
| --- src/tagview.c | ||
| +++ src/tagview.c | ||
| @@ -68,12 +68,12 @@ | ||
| 68 | 68 | " ORDER BY tx.mtime DESC %s", |
| 69 | 69 | zLikeClause, zLimit |
| 70 | 70 | ); |
| 71 | 71 | db_generic_query_view(zSql, 1); |
| 72 | 72 | free(zSql); |
| 73 | - if( strlen(zLikeClause) ) free(zLikeClause); | |
| 74 | - if( strlen(zLimit) ) free(zLimit); | |
| 73 | + if( zLikeClause[0] ) free(zLikeClause); | |
| 74 | + if( zLimit[0] ) free(zLimit); | |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /* |
| 78 | 78 | ** A small search form which forwards to ?like=SEARCH_STRING |
| 79 | 79 | */ |
| 80 | 80 |
| --- src/tagview.c | |
| +++ src/tagview.c | |
| @@ -68,12 +68,12 @@ | |
| 68 | " ORDER BY tx.mtime DESC %s", |
| 69 | zLikeClause, zLimit |
| 70 | ); |
| 71 | db_generic_query_view(zSql, 1); |
| 72 | free(zSql); |
| 73 | if( strlen(zLikeClause) ) free(zLikeClause); |
| 74 | if( strlen(zLimit) ) free(zLimit); |
| 75 | } |
| 76 | |
| 77 | /* |
| 78 | ** A small search form which forwards to ?like=SEARCH_STRING |
| 79 | */ |
| 80 |
| --- src/tagview.c | |
| +++ src/tagview.c | |
| @@ -68,12 +68,12 @@ | |
| 68 | " ORDER BY tx.mtime DESC %s", |
| 69 | zLikeClause, zLimit |
| 70 | ); |
| 71 | db_generic_query_view(zSql, 1); |
| 72 | free(zSql); |
| 73 | if( zLikeClause[0] ) free(zLikeClause); |
| 74 | if( zLimit[0] ) free(zLimit); |
| 75 | } |
| 76 | |
| 77 | /* |
| 78 | ** A small search form which forwards to ?like=SEARCH_STRING |
| 79 | */ |
| 80 |