Fossil SCM

Update the codecheck1.c utility program to find unsafe format strings for recently added varargs functions. Fix unsafe varargs found by this update. This is a continuation of the fix in check-in [3c2ef25d03fb48d5].

drh 2018-01-16 16:30 trunk
Commit 2fac7df467ba00d73e2eb4b192ffe0d581485dd8c8e243ab1fb2d844f74a3955
Parent dddad4f0734d399…
7 files changed +17 -2 +3 -3 +1 -1 +2 -2 +1 -1 +1 -1 +8 -8
~ src/codecheck1.c ~ src/db.c ~ src/json.c ~ src/json_branch.c ~ src/printf.c ~ src/setup.c ~ src/skins.c
M src/codecheck1.c
+17 -2
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -141,10 +141,14 @@
141141
 (*pLN)++;
142142
 i++;
143143
 }
144144
 *pType = TK_SPACE;
145145
 return i;
146
+ }
147
+ if( z[0]=='\\' && (z[1]=='\n' || (z[1]=='\r' && z[2]=='\n')) ){
148
+ *pType = TK_SPACE;
149
+ return 1;
146150
 }
147151
 *pType = TK_OTHER;
148152
 return 1;
149153
 }
150154
@@ -201,10 +205,11 @@
201205
 ** Return true if the input is a string literal.
202206
 */
203207
 static int is_string_lit(const char *z){
204208
 int nu1, nu2;
205209
 z = next_non_whitespace(z, &nu1, &nu2);
210
+ if( strcmp(z, "NULL")==0 ) return 1;
206211
 return z[0]=='"';
207212
 }
208213
209214
 /*
210215
 ** Return true if the input is an expression of string literals:
@@ -310,25 +315,31 @@
310315
 unsigned fmtFlags; /* Processing flags */
311316
 } aFmtFunc[] = {
312317
 { "admin_log", 1, 0 },
313318
 { "blob_append_sql", 2, FMT_NO_S },
314319
 { "blob_appendf", 2, 0 },
320
+ { "cgi_debug", 1, 0 },
315321
 { "cgi_panic", 1, 0 },
322
+ { "cgi_printf", 1, 0 },
316323
 { "cgi_redirectf", 1, 0 },
317324
 { "chref", 2, 0 },
318325
 { "db_blob", 2, FMT_NO_S },
326
+ { "db_debug", 1, FMT_NO_S },
319327
 { "db_double", 2, FMT_NO_S },
320328
 { "db_err", 1, 0 },
321329
 { "db_exists", 1, FMT_NO_S },
330
+ { "db_get_mprintf", 2, 0 },
322331
 { "db_int", 2, FMT_NO_S },
323332
 { "db_int64", 2, FMT_NO_S },
324333
 { "db_multi_exec", 1, FMT_NO_S },
325334
 { "db_optional_sql", 2, FMT_NO_S },
326335
 { "db_prepare", 2, FMT_NO_S },
327336
 { "db_prepare_ignore_error", 2, FMT_NO_S },
337
+ { "db_set_mprintf", 3, 0 },
328338
 { "db_static_prepare", 2, FMT_NO_S },
329339
 { "db_text", 2, FMT_NO_S },
340
+ { "db_unset_mprintf", 2, 0 },
330341
 { "form_begin", 2, 0 },
331342
 { "fossil_error", 2, 0 },
332343
 { "fossil_errorlog", 1, 0 },
333344
 { "fossil_fatal", 1, 0 },
334345
 { "fossil_fatal_recursive", 1, 0 },
@@ -336,15 +347,19 @@
336347
 { "fossil_print", 1, 0 },
337348
 { "fossil_trace", 1, 0 },
338349
 { "fossil_warning", 1, 0 },
339350
 { "href", 1, 0 },
340351
 { "json_new_string_f", 1, 0 },
352
+ { "json_set_err", 2, 0 },
353
+ { "json_warn", 2, 0 },
341354
 { "mprintf", 1, 0 },
342355
 { "socket_set_errmsg", 1, 0 },
343356
 { "ssl_set_errmsg", 1, 0 },
344357
 { "style_header", 1, 0 },
345358
 { "style_set_current_page", 1, 0 },
359
+ { "style_submenu_element", 2, 0 },
360
+ { "style_submenu_sql", 3, 0 },
346361
 { "webpage_error", 1, 0 },
347362
 { "xhref", 2, 0 },
348363
 };
349364
350365
 /*
@@ -467,12 +482,12 @@
467482
 }else{
468483
 const char *zFmt = azArg[fmtArg-1];
469484
 const char *zOverride = strstr(zFmt, "/*works-like:");
470485
 if( zOverride ) zFmt = zOverride + sizeof("/*works-like:")-1;
471486
 if( !is_string_lit(zFmt) ){
472
- printf("%s:%d: %.*s() has non-constant format string\n",
473
- zFilename, lnFCall, szFName, zFCall);
487
+ printf("%s:%d: %.*s() has non-constant format on arg[%d]\n",
488
+ zFilename, lnFCall, szFName, zFCall, fmtArg-1);
474489
 nErr++;
475490
 }else if( (k = formatArgCount(zFmt, nArg, acType))>=0
476491
 && nArg!=fmtArg+k ){
477492
 printf("%s:%d: too %s arguments to %.*s() "
478493
 "- got %d and expected %d\n",
479494
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -141,10 +141,14 @@
141 (*pLN)++;
142 i++;
143 }
144 *pType = TK_SPACE;
145 return i;
 
 
 
 
146 }
147 *pType = TK_OTHER;
148 return 1;
149 }
150
@@ -201,10 +205,11 @@
201 ** Return true if the input is a string literal.
202 */
203 static int is_string_lit(const char *z){
204 int nu1, nu2;
205 z = next_non_whitespace(z, &nu1, &nu2);
 
206 return z[0]=='"';
207 }
208
209 /*
210 ** Return true if the input is an expression of string literals:
@@ -310,25 +315,31 @@
310 unsigned fmtFlags; /* Processing flags */
311 } aFmtFunc[] = {
312 { "admin_log", 1, 0 },
313 { "blob_append_sql", 2, FMT_NO_S },
314 { "blob_appendf", 2, 0 },
 
315 { "cgi_panic", 1, 0 },
 
316 { "cgi_redirectf", 1, 0 },
317 { "chref", 2, 0 },
318 { "db_blob", 2, FMT_NO_S },
 
319 { "db_double", 2, FMT_NO_S },
320 { "db_err", 1, 0 },
321 { "db_exists", 1, FMT_NO_S },
 
322 { "db_int", 2, FMT_NO_S },
323 { "db_int64", 2, FMT_NO_S },
324 { "db_multi_exec", 1, FMT_NO_S },
325 { "db_optional_sql", 2, FMT_NO_S },
326 { "db_prepare", 2, FMT_NO_S },
327 { "db_prepare_ignore_error", 2, FMT_NO_S },
 
328 { "db_static_prepare", 2, FMT_NO_S },
329 { "db_text", 2, FMT_NO_S },
 
330 { "form_begin", 2, 0 },
331 { "fossil_error", 2, 0 },
332 { "fossil_errorlog", 1, 0 },
333 { "fossil_fatal", 1, 0 },
334 { "fossil_fatal_recursive", 1, 0 },
@@ -336,15 +347,19 @@
336 { "fossil_print", 1, 0 },
337 { "fossil_trace", 1, 0 },
338 { "fossil_warning", 1, 0 },
339 { "href", 1, 0 },
340 { "json_new_string_f", 1, 0 },
 
 
341 { "mprintf", 1, 0 },
342 { "socket_set_errmsg", 1, 0 },
343 { "ssl_set_errmsg", 1, 0 },
344 { "style_header", 1, 0 },
345 { "style_set_current_page", 1, 0 },
 
 
346 { "webpage_error", 1, 0 },
347 { "xhref", 2, 0 },
348 };
349
350 /*
@@ -467,12 +482,12 @@
467 }else{
468 const char *zFmt = azArg[fmtArg-1];
469 const char *zOverride = strstr(zFmt, "/*works-like:");
470 if( zOverride ) zFmt = zOverride + sizeof("/*works-like:")-1;
471 if( !is_string_lit(zFmt) ){
472 printf("%s:%d: %.*s() has non-constant format string\n",
473 zFilename, lnFCall, szFName, zFCall);
474 nErr++;
475 }else if( (k = formatArgCount(zFmt, nArg, acType))>=0
476 && nArg!=fmtArg+k ){
477 printf("%s:%d: too %s arguments to %.*s() "
478 "- got %d and expected %d\n",
479
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -141,10 +141,14 @@
141 (*pLN)++;
142 i++;
143 }
144 *pType = TK_SPACE;
145 return i;
146 }
147 if( z[0]=='\\' && (z[1]=='\n' || (z[1]=='\r' && z[2]=='\n')) ){
148 *pType = TK_SPACE;
149 return 1;
150 }
151 *pType = TK_OTHER;
152 return 1;
153 }
154
@@ -201,10 +205,11 @@
205 ** Return true if the input is a string literal.
206 */
207 static int is_string_lit(const char *z){
208 int nu1, nu2;
209 z = next_non_whitespace(z, &nu1, &nu2);
210 if( strcmp(z, "NULL")==0 ) return 1;
211 return z[0]=='"';
212 }
213
214 /*
215 ** Return true if the input is an expression of string literals:
@@ -310,25 +315,31 @@
315 unsigned fmtFlags; /* Processing flags */
316 } aFmtFunc[] = {
317 { "admin_log", 1, 0 },
318 { "blob_append_sql", 2, FMT_NO_S },
319 { "blob_appendf", 2, 0 },
320 { "cgi_debug", 1, 0 },
321 { "cgi_panic", 1, 0 },
322 { "cgi_printf", 1, 0 },
323 { "cgi_redirectf", 1, 0 },
324 { "chref", 2, 0 },
325 { "db_blob", 2, FMT_NO_S },
326 { "db_debug", 1, FMT_NO_S },
327 { "db_double", 2, FMT_NO_S },
328 { "db_err", 1, 0 },
329 { "db_exists", 1, FMT_NO_S },
330 { "db_get_mprintf", 2, 0 },
331 { "db_int", 2, FMT_NO_S },
332 { "db_int64", 2, FMT_NO_S },
333 { "db_multi_exec", 1, FMT_NO_S },
334 { "db_optional_sql", 2, FMT_NO_S },
335 { "db_prepare", 2, FMT_NO_S },
336 { "db_prepare_ignore_error", 2, FMT_NO_S },
337 { "db_set_mprintf", 3, 0 },
338 { "db_static_prepare", 2, FMT_NO_S },
339 { "db_text", 2, FMT_NO_S },
340 { "db_unset_mprintf", 2, 0 },
341 { "form_begin", 2, 0 },
342 { "fossil_error", 2, 0 },
343 { "fossil_errorlog", 1, 0 },
344 { "fossil_fatal", 1, 0 },
345 { "fossil_fatal_recursive", 1, 0 },
@@ -336,15 +347,19 @@
347 { "fossil_print", 1, 0 },
348 { "fossil_trace", 1, 0 },
349 { "fossil_warning", 1, 0 },
350 { "href", 1, 0 },
351 { "json_new_string_f", 1, 0 },
352 { "json_set_err", 2, 0 },
353 { "json_warn", 2, 0 },
354 { "mprintf", 1, 0 },
355 { "socket_set_errmsg", 1, 0 },
356 { "ssl_set_errmsg", 1, 0 },
357 { "style_header", 1, 0 },
358 { "style_set_current_page", 1, 0 },
359 { "style_submenu_element", 2, 0 },
360 { "style_submenu_sql", 3, 0 },
361 { "webpage_error", 1, 0 },
362 { "xhref", 2, 0 },
363 };
364
365 /*
@@ -467,12 +482,12 @@
482 }else{
483 const char *zFmt = azArg[fmtArg-1];
484 const char *zOverride = strstr(zFmt, "/*works-like:");
485 if( zOverride ) zFmt = zOverride + sizeof("/*works-like:")-1;
486 if( !is_string_lit(zFmt) ){
487 printf("%s:%d: %.*s() has non-constant format on arg[%d]\n",
488 zFilename, lnFCall, szFName, zFCall, fmtArg-1);
489 nErr++;
490 }else if( (k = formatArgCount(zFmt, nArg, acType))>=0
491 && nArg!=fmtArg+k ){
492 printf("%s:%d: too %s arguments to %.*s() "
493 "- got %d and expected %d\n",
494
M src/db.c
+3 -3
--- src/db.c
+++ src/db.c
@@ -2482,11 +2482,11 @@
24822482
 db_multi_exec("REPLACE INTO vvar(name,value) VALUES(%Q,%d)", zName, value);
24832483
 }
24842484
24852485
 /* Va-args versions of db_get(), db_set(), and db_unset()
24862486
 */
2487
-char *db_get_mprintf(const char *zFormat, const char *zDefault, ...){
2487
+char *db_get_mprintf(const char *zDefault, const char *zFormat, ...){
24882488
 va_list ap;
24892489
 char *zName;
24902490
 char *zResult;
24912491
 va_start(ap, zDefault);
24922492
 zName = vmprintf(zFormat, ap);
@@ -2493,20 +2493,20 @@
24932493
 va_end(ap);
24942494
 zResult = db_get(zName, zDefault);
24952495
 fossil_free(zName);
24962496
 return zResult;
24972497
 }
2498
-void db_set_mprintf(const char *zFormat, const char *zNew, int iGlobal, ...){
2498
+void db_set_mprintf(const char *zNew, int iGlobal, const char *zFormat, ...){
24992499
 va_list ap;
25002500
 char *zName;
25012501
 va_start(ap, iGlobal);
25022502
 zName = vmprintf(zFormat, ap);
25032503
 va_end(ap);
25042504
 db_set(zName, zNew, iGlobal);
25052505
 fossil_free(zName);
25062506
 }
2507
-void db_unset_mprintf(const char *zFormat, int iGlobal, ...){
2507
+void db_unset_mprintf(int iGlobal, const char *zFormat, ...){
25082508
 va_list ap;
25092509
 char *zName;
25102510
 va_start(ap, iGlobal);
25112511
 zName = vmprintf(zFormat, ap);
25122512
 va_end(ap);
25132513
--- src/db.c
+++ src/db.c
@@ -2482,11 +2482,11 @@
2482 db_multi_exec("REPLACE INTO vvar(name,value) VALUES(%Q,%d)", zName, value);
2483 }
2484
2485 /* Va-args versions of db_get(), db_set(), and db_unset()
2486 */
2487 char *db_get_mprintf(const char *zFormat, const char *zDefault, ...){
2488 va_list ap;
2489 char *zName;
2490 char *zResult;
2491 va_start(ap, zDefault);
2492 zName = vmprintf(zFormat, ap);
@@ -2493,20 +2493,20 @@
2493 va_end(ap);
2494 zResult = db_get(zName, zDefault);
2495 fossil_free(zName);
2496 return zResult;
2497 }
2498 void db_set_mprintf(const char *zFormat, const char *zNew, int iGlobal, ...){
2499 va_list ap;
2500 char *zName;
2501 va_start(ap, iGlobal);
2502 zName = vmprintf(zFormat, ap);
2503 va_end(ap);
2504 db_set(zName, zNew, iGlobal);
2505 fossil_free(zName);
2506 }
2507 void db_unset_mprintf(const char *zFormat, int iGlobal, ...){
2508 va_list ap;
2509 char *zName;
2510 va_start(ap, iGlobal);
2511 zName = vmprintf(zFormat, ap);
2512 va_end(ap);
2513
--- src/db.c
+++ src/db.c
@@ -2482,11 +2482,11 @@
2482 db_multi_exec("REPLACE INTO vvar(name,value) VALUES(%Q,%d)", zName, value);
2483 }
2484
2485 /* Va-args versions of db_get(), db_set(), and db_unset()
2486 */
2487 char *db_get_mprintf(const char *zDefault, const char *zFormat, ...){
2488 va_list ap;
2489 char *zName;
2490 char *zResult;
2491 va_start(ap, zDefault);
2492 zName = vmprintf(zFormat, ap);
@@ -2493,20 +2493,20 @@
2493 va_end(ap);
2494 zResult = db_get(zName, zDefault);
2495 fossil_free(zName);
2496 return zResult;
2497 }
2498 void db_set_mprintf(const char *zNew, int iGlobal, const char *zFormat, ...){
2499 va_list ap;
2500 char *zName;
2501 va_start(ap, iGlobal);
2502 zName = vmprintf(zFormat, ap);
2503 va_end(ap);
2504 db_set(zName, zNew, iGlobal);
2505 fossil_free(zName);
2506 }
2507 void db_unset_mprintf(int iGlobal, const char *zFormat, ...){
2508 va_list ap;
2509 char *zName;
2510 va_start(ap, iGlobal);
2511 zName = vmprintf(zFormat, ap);
2512 va_end(ap);
2513
M src/json.c
+1 -1
--- src/json.c
+++ src/json.c
@@ -1608,11 +1608,11 @@
16081608
 return NULL;
16091609
 }
16101610
 }
16111611
 cson_value_free(colNamesV);
16121612
 if(warnMsg){
1613
- json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, warnMsg );
1613
+ json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, "%s", warnMsg );
16141614
 }
16151615
 return cson_array_value(a);
16161616
 }
16171617
16181618
 /*
16191619
--- src/json.c
+++ src/json.c
@@ -1608,11 +1608,11 @@
1608 return NULL;
1609 }
1610 }
1611 cson_value_free(colNamesV);
1612 if(warnMsg){
1613 json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, warnMsg );
1614 }
1615 return cson_array_value(a);
1616 }
1617
1618 /*
1619
--- src/json.c
+++ src/json.c
@@ -1608,11 +1608,11 @@
1608 return NULL;
1609 }
1610 }
1611 cson_value_free(colNamesV);
1612 if(warnMsg){
1613 json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, "%s", warnMsg );
1614 }
1615 return cson_array_value(a);
1616 }
1617
1618 /*
1619
M src/json_branch.c
+2 -2
--- src/json_branch.c
+++ src/json_branch.c
@@ -140,11 +140,11 @@
140140
 sawConversionError = mprintf("Column-to-json failed @ %s:%d",
141141
 __FILE__,__LINE__);
142142
 }
143143
 }
144144
 if( sawConversionError ){
145
- json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,sawConversionError);
145
+ json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,"%s",sawConversionError);
146146
 free(sawConversionError);
147147
 }
148148
 return payV;
149149
 }
150150
@@ -359,11 +359,11 @@
359359
 }
360360
 }
361361
362362
 rc = json_branch_new( &opt, &rid );
363363
 if(rc){
364
- json_set_err(rc, opt.rcErrMsg);
364
+ json_set_err(rc, "%s", opt.rcErrMsg);
365365
 goto error;
366366
 }
367367
 assert(0 != rid);
368368
 payV = cson_value_new_object();
369369
 pay = cson_value_get_object(payV);
370370
--- src/json_branch.c
+++ src/json_branch.c
@@ -140,11 +140,11 @@
140 sawConversionError = mprintf("Column-to-json failed @ %s:%d",
141 __FILE__,__LINE__);
142 }
143 }
144 if( sawConversionError ){
145 json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,sawConversionError);
146 free(sawConversionError);
147 }
148 return payV;
149 }
150
@@ -359,11 +359,11 @@
359 }
360 }
361
362 rc = json_branch_new( &opt, &rid );
363 if(rc){
364 json_set_err(rc, opt.rcErrMsg);
365 goto error;
366 }
367 assert(0 != rid);
368 payV = cson_value_new_object();
369 pay = cson_value_get_object(payV);
370
--- src/json_branch.c
+++ src/json_branch.c
@@ -140,11 +140,11 @@
140 sawConversionError = mprintf("Column-to-json failed @ %s:%d",
141 __FILE__,__LINE__);
142 }
143 }
144 if( sawConversionError ){
145 json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,"%s",sawConversionError);
146 free(sawConversionError);
147 }
148 return payV;
149 }
150
@@ -359,11 +359,11 @@
359 }
360 }
361
362 rc = json_branch_new( &opt, &rid );
363 if(rc){
364 json_set_err(rc, "%s", opt.rcErrMsg);
365 goto error;
366 }
367 assert(0 != rid);
368 payV = cson_value_new_object();
369 pay = cson_value_get_object(payV);
370
M src/printf.c
+1 -1
--- src/printf.c
+++ src/printf.c
@@ -1148,11 +1148,11 @@
11481148
 z = vmprintf(zFormat, ap);
11491149
 va_end(ap);
11501150
 fossil_errorlog("warning: %s", z);
11511151
 #ifdef FOSSIL_ENABLE_JSON
11521152
 if(g.json.isJsonMode){
1153
- json_warn( FSL_JSON_W_UNKNOWN, z );
1153
+ json_warn( FSL_JSON_W_UNKNOWN, "%s", z );
11541154
 }else
11551155
 #endif
11561156
 {
11571157
 if( g.cgiOutput ){
11581158
 cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
11591159
--- src/printf.c
+++ src/printf.c
@@ -1148,11 +1148,11 @@
1148 z = vmprintf(zFormat, ap);
1149 va_end(ap);
1150 fossil_errorlog("warning: %s", z);
1151 #ifdef FOSSIL_ENABLE_JSON
1152 if(g.json.isJsonMode){
1153 json_warn( FSL_JSON_W_UNKNOWN, z );
1154 }else
1155 #endif
1156 {
1157 if( g.cgiOutput ){
1158 cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
1159
--- src/printf.c
+++ src/printf.c
@@ -1148,11 +1148,11 @@
1148 z = vmprintf(zFormat, ap);
1149 va_end(ap);
1150 fossil_errorlog("warning: %s", z);
1151 #ifdef FOSSIL_ENABLE_JSON
1152 if(g.json.isJsonMode){
1153 json_warn( FSL_JSON_W_UNKNOWN, "%s", z );
1154 }else
1155 #endif
1156 {
1157 if( g.cgiOutput ){
1158 cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
1159
M src/setup.c
+1 -1
--- src/setup.c
+++ src/setup.c
@@ -600,11 +600,11 @@
600600
 free(z2);
601601
 }
602602
603603
 /* Begin generating the page
604604
 */
605
- style_submenu_element("Cancel", cgi_referer("setup_ulist"));
605
+ style_submenu_element("Cancel", "%s", cgi_referer("setup_ulist"));
606606
 if( uid ){
607607
 style_header("Edit User %h", zLogin);
608608
 style_submenu_element("Access Log", "%R/access_log?u=%t", zLogin);
609609
 }else{
610610
 style_header("Add A New User");
611611
--- src/setup.c
+++ src/setup.c
@@ -600,11 +600,11 @@
600 free(z2);
601 }
602
603 /* Begin generating the page
604 */
605 style_submenu_element("Cancel", cgi_referer("setup_ulist"));
606 if( uid ){
607 style_header("Edit User %h", zLogin);
608 style_submenu_element("Access Log", "%R/access_log?u=%t", zLogin);
609 }else{
610 style_header("Add A New User");
611
--- src/setup.c
+++ src/setup.c
@@ -600,11 +600,11 @@
600 free(z2);
601 }
602
603 /* Begin generating the page
604 */
605 style_submenu_element("Cancel", "%s", cgi_referer("setup_ulist"));
606 if( uid ){
607 style_header("Edit User %h", zLogin);
608 style_submenu_element("Access Log", "%R/access_log?u=%t", zLogin);
609 }else{
610 style_header("Add A New User");
611
M src/skins.c
+8 -8
--- src/skins.c
+++ src/skins.c
@@ -667,11 +667,11 @@
667667
 static const char *skin_file_content(const char *zLabel, const char *zFile){
668668
 const char *zResult;
669669
 if( fossil_strcmp(zLabel, "current")==0 ){
670670
 zResult = db_get(zFile, "");
671671
 }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){
672
- zResult = db_get_mprintf("%s-%s", "", zLabel, zFile);
672
+ zResult = db_get_mprintf("", "%s-%s", zLabel, zFile);
673673
 }else{
674674
 while( 1 ){
675675
 char *zKey = mprintf("skins/%s/%s.txt", zLabel, zFile);
676676
 zResult = builtin_text(zKey);
677677
 fossil_free(zKey);
@@ -718,11 +718,11 @@
718718
 iSkin = atoi(PD("sk","1"));
719719
 if( iSkin<1 || iSkin>9 ) iSkin = 1;
720720
721721
 /* Check that the user is authorized to edit this skin. */
722722
 if( !g.perm.Setup ){
723
- char *zAllowedEditors = db_get_mprintf("draft%d-users", "", iSkin);
723
+ char *zAllowedEditors = db_get_mprintf("", "draft%d-users", iSkin);
724724
 Glob *pAllowedEditors;
725725
 if( zAllowedEditors[0] ){
726726
 pAllowedEditors = glob_create(zAllowedEditors);
727727
 if( !glob_match(pAllowedEditors, zAllowedEditors) ){
728728
 login_needed(0);
@@ -801,11 +801,11 @@
801801
 static void skin_initialize_draft(int iSkin, const char *zTemplate){
802802
 int i;
803803
 if( zTemplate==0 ) return;
804804
 for(i=0; i<count(azSkinFile); i++){
805805
 const char *z = skin_file_content(zTemplate, azSkinFile[i]);
806
- db_set_mprintf("draft%d-%s", z, 0, iSkin, azSkinFile[i]);
806
+ db_set_mprintf(z, 0, "draft%d-%s", iSkin, azSkinFile[i]);
807807
 }
808808
 }
809809
810810
 /*
811811
 ** Publish the draft skin iSkin as the new default.
@@ -838,11 +838,11 @@
838838
 );
839839
 }
840840
841841
 /* Publish draft iSkin */
842842
 for(i=0; i<count(azSkinFile); i++){
843
- char *zNew = db_get_mprintf("draft%d-%s", "", iSkin, azSkinFile[i]);
843
+ char *zNew = db_get_mprintf("", "draft%d-%s", iSkin, azSkinFile[i]);
844844
 db_set(azSkinFile[i], zNew, 0);
845845
 }
846846
 }
847847
848848
 /*
@@ -872,11 +872,11 @@
872872
873873
 /* Figure out if the current user is allowed to make administrative
874874
 ** changes and/or edits
875875
 */
876876
 login_check_credentials();
877
- zAllowedEditors = db_get_mprintf("draft%d-users", "", iSkin);
877
+ zAllowedEditors = db_get_mprintf("", "draft%d-users", iSkin);
878878
 if( g.perm.Setup ){
879879
 isSetup = isEditor = 1;
880880
 }else{
881881
 Glob *pAllowedEditors;
882882
 isSetup = isEditor = 0;
@@ -890,12 +890,12 @@
890890
 /* Initialize the skin, if requested and authorized. */
891891
 if( P("init3")!=0 && isEditor ){
892892
 skin_initialize_draft(iSkin, P("initskin"));
893893
 }
894894
 if( P("submit2")!=0 && isSetup ){
895
- db_set_mprintf("draft%d-users", PD("editors",""), 0, iSkin);
896
- zAllowedEditors = db_get_mprintf("draft%d-users", "", iSkin);
895
+ db_set_mprintf(PD("editors",""), 0, "draft%d-users", iSkin);
896
+ zAllowedEditors = db_get_mprintf("", "draft%d-users", iSkin);
897897
 }
898898
899899
 /* Publish the draft skin */
900900
 if( P("pub7")!=0 && PB("pub7ck1") && PB("pub7ck2") ){
901901
 skin_publish(iSkin);
@@ -959,11 +959,11 @@
959959
 @
960960
 @ <a name='step3'></a>
961961
 @ <h1>Step 3: Initialize The Draft</h1>
962962
 @
963963
 if( !isEditor ){
964
- @ <p>You are not allowed to initialize draft%(iSkin). Contact
964
+ @ <p>You are not allowed to initialize draft%d(iSkin). Contact
965965
 @ the administrator for this repository for more information.
966966
 }else{
967967
 @ <p>Initialize the draft%d(iSkin) skin to one of the built-in skins
968968
 @ or a preexisting skin, to use as a baseline.</p>
969969
 @
970970
--- src/skins.c
+++ src/skins.c
@@ -667,11 +667,11 @@
667 static const char *skin_file_content(const char *zLabel, const char *zFile){
668 const char *zResult;
669 if( fossil_strcmp(zLabel, "current")==0 ){
670 zResult = db_get(zFile, "");
671 }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){
672 zResult = db_get_mprintf("%s-%s", "", zLabel, zFile);
673 }else{
674 while( 1 ){
675 char *zKey = mprintf("skins/%s/%s.txt", zLabel, zFile);
676 zResult = builtin_text(zKey);
677 fossil_free(zKey);
@@ -718,11 +718,11 @@
718 iSkin = atoi(PD("sk","1"));
719 if( iSkin<1 || iSkin>9 ) iSkin = 1;
720
721 /* Check that the user is authorized to edit this skin. */
722 if( !g.perm.Setup ){
723 char *zAllowedEditors = db_get_mprintf("draft%d-users", "", iSkin);
724 Glob *pAllowedEditors;
725 if( zAllowedEditors[0] ){
726 pAllowedEditors = glob_create(zAllowedEditors);
727 if( !glob_match(pAllowedEditors, zAllowedEditors) ){
728 login_needed(0);
@@ -801,11 +801,11 @@
801 static void skin_initialize_draft(int iSkin, const char *zTemplate){
802 int i;
803 if( zTemplate==0 ) return;
804 for(i=0; i<count(azSkinFile); i++){
805 const char *z = skin_file_content(zTemplate, azSkinFile[i]);
806 db_set_mprintf("draft%d-%s", z, 0, iSkin, azSkinFile[i]);
807 }
808 }
809
810 /*
811 ** Publish the draft skin iSkin as the new default.
@@ -838,11 +838,11 @@
838 );
839 }
840
841 /* Publish draft iSkin */
842 for(i=0; i<count(azSkinFile); i++){
843 char *zNew = db_get_mprintf("draft%d-%s", "", iSkin, azSkinFile[i]);
844 db_set(azSkinFile[i], zNew, 0);
845 }
846 }
847
848 /*
@@ -872,11 +872,11 @@
872
873 /* Figure out if the current user is allowed to make administrative
874 ** changes and/or edits
875 */
876 login_check_credentials();
877 zAllowedEditors = db_get_mprintf("draft%d-users", "", iSkin);
878 if( g.perm.Setup ){
879 isSetup = isEditor = 1;
880 }else{
881 Glob *pAllowedEditors;
882 isSetup = isEditor = 0;
@@ -890,12 +890,12 @@
890 /* Initialize the skin, if requested and authorized. */
891 if( P("init3")!=0 && isEditor ){
892 skin_initialize_draft(iSkin, P("initskin"));
893 }
894 if( P("submit2")!=0 && isSetup ){
895 db_set_mprintf("draft%d-users", PD("editors",""), 0, iSkin);
896 zAllowedEditors = db_get_mprintf("draft%d-users", "", iSkin);
897 }
898
899 /* Publish the draft skin */
900 if( P("pub7")!=0 && PB("pub7ck1") && PB("pub7ck2") ){
901 skin_publish(iSkin);
@@ -959,11 +959,11 @@
959 @
960 @ <a name='step3'></a>
961 @ <h1>Step 3: Initialize The Draft</h1>
962 @
963 if( !isEditor ){
964 @ <p>You are not allowed to initialize draft%(iSkin). Contact
965 @ the administrator for this repository for more information.
966 }else{
967 @ <p>Initialize the draft%d(iSkin) skin to one of the built-in skins
968 @ or a preexisting skin, to use as a baseline.</p>
969 @
970
--- src/skins.c
+++ src/skins.c
@@ -667,11 +667,11 @@
667 static const char *skin_file_content(const char *zLabel, const char *zFile){
668 const char *zResult;
669 if( fossil_strcmp(zLabel, "current")==0 ){
670 zResult = db_get(zFile, "");
671 }else if( sqlite3_strglob("draft[1-9]", zLabel)==0 ){
672 zResult = db_get_mprintf("", "%s-%s", zLabel, zFile);
673 }else{
674 while( 1 ){
675 char *zKey = mprintf("skins/%s/%s.txt", zLabel, zFile);
676 zResult = builtin_text(zKey);
677 fossil_free(zKey);
@@ -718,11 +718,11 @@
718 iSkin = atoi(PD("sk","1"));
719 if( iSkin<1 || iSkin>9 ) iSkin = 1;
720
721 /* Check that the user is authorized to edit this skin. */
722 if( !g.perm.Setup ){
723 char *zAllowedEditors = db_get_mprintf("", "draft%d-users", iSkin);
724 Glob *pAllowedEditors;
725 if( zAllowedEditors[0] ){
726 pAllowedEditors = glob_create(zAllowedEditors);
727 if( !glob_match(pAllowedEditors, zAllowedEditors) ){
728 login_needed(0);
@@ -801,11 +801,11 @@
801 static void skin_initialize_draft(int iSkin, const char *zTemplate){
802 int i;
803 if( zTemplate==0 ) return;
804 for(i=0; i<count(azSkinFile); i++){
805 const char *z = skin_file_content(zTemplate, azSkinFile[i]);
806 db_set_mprintf(z, 0, "draft%d-%s", iSkin, azSkinFile[i]);
807 }
808 }
809
810 /*
811 ** Publish the draft skin iSkin as the new default.
@@ -838,11 +838,11 @@
838 );
839 }
840
841 /* Publish draft iSkin */
842 for(i=0; i<count(azSkinFile); i++){
843 char *zNew = db_get_mprintf("", "draft%d-%s", iSkin, azSkinFile[i]);
844 db_set(azSkinFile[i], zNew, 0);
845 }
846 }
847
848 /*
@@ -872,11 +872,11 @@
872
873 /* Figure out if the current user is allowed to make administrative
874 ** changes and/or edits
875 */
876 login_check_credentials();
877 zAllowedEditors = db_get_mprintf("", "draft%d-users", iSkin);
878 if( g.perm.Setup ){
879 isSetup = isEditor = 1;
880 }else{
881 Glob *pAllowedEditors;
882 isSetup = isEditor = 0;
@@ -890,12 +890,12 @@
890 /* Initialize the skin, if requested and authorized. */
891 if( P("init3")!=0 && isEditor ){
892 skin_initialize_draft(iSkin, P("initskin"));
893 }
894 if( P("submit2")!=0 && isSetup ){
895 db_set_mprintf(PD("editors",""), 0, "draft%d-users", iSkin);
896 zAllowedEditors = db_get_mprintf("", "draft%d-users", iSkin);
897 }
898
899 /* Publish the draft skin */
900 if( P("pub7")!=0 && PB("pub7ck1") && PB("pub7ck2") ){
901 skin_publish(iSkin);
@@ -959,11 +959,11 @@
959 @
960 @ <a name='step3'></a>
961 @ <h1>Step 3: Initialize The Draft</h1>
962 @
963 if( !isEditor ){
964 @ <p>You are not allowed to initialize draft%d(iSkin). Contact
965 @ the administrator for this repository for more information.
966 }else{
967 @ <p>Initialize the draft%d(iSkin) skin to one of the built-in skins
968 @ or a preexisting skin, to use as a baseline.</p>
969 @
970

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button