Fossil SCM
Windows: escape --mainmenu's argument before passing it on to child ui process.
Commit
d059d620377137fe1ff173aa2370fa792a581b3246b03046a8f351d3b6400135
Parent
d6e698c2657b41a…
1 file changed
+2
-1
+2
-1
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -571,11 +571,12 @@ | ||
| 571 | 571 | zSkin = skin_in_use(); |
| 572 | 572 | if( zSkin ){ |
| 573 | 573 | blob_appendf(&options, " --skin %s", zSkin); |
| 574 | 574 | } |
| 575 | 575 | if( g.zMainMenuFile ){ |
| 576 | - blob_appendf(&options, " --mainmenu %s", g.zMainMenuFile); | |
| 576 | + blob_appendf(&options, " --mainmenu "); | |
| 577 | + blob_append_escaped_arg(&options, g.zMainMenuFile); | |
| 577 | 578 | } |
| 578 | 579 | #if USE_SEE |
| 579 | 580 | zSavedKey = db_get_saved_encryption_key(); |
| 580 | 581 | savedKeySize = db_get_saved_encryption_key_size(); |
| 581 | 582 | if( zSavedKey!=0 && savedKeySize>0 ){ |
| 582 | 583 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -571,11 +571,12 @@ | |
| 571 | zSkin = skin_in_use(); |
| 572 | if( zSkin ){ |
| 573 | blob_appendf(&options, " --skin %s", zSkin); |
| 574 | } |
| 575 | if( g.zMainMenuFile ){ |
| 576 | blob_appendf(&options, " --mainmenu %s", g.zMainMenuFile); |
| 577 | } |
| 578 | #if USE_SEE |
| 579 | zSavedKey = db_get_saved_encryption_key(); |
| 580 | savedKeySize = db_get_saved_encryption_key_size(); |
| 581 | if( zSavedKey!=0 && savedKeySize>0 ){ |
| 582 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -571,11 +571,12 @@ | |
| 571 | zSkin = skin_in_use(); |
| 572 | if( zSkin ){ |
| 573 | blob_appendf(&options, " --skin %s", zSkin); |
| 574 | } |
| 575 | if( g.zMainMenuFile ){ |
| 576 | blob_appendf(&options, " --mainmenu "); |
| 577 | blob_append_escaped_arg(&options, g.zMainMenuFile); |
| 578 | } |
| 579 | #if USE_SEE |
| 580 | zSavedKey = db_get_saved_encryption_key(); |
| 581 | savedKeySize = db_get_saved_encryption_key_size(); |
| 582 | if( zSavedKey!=0 && savedKeySize>0 ){ |
| 583 |