Fossil SCM
Fix segfault on certain /annotate pages. (Discovered using many-www.tcl test script.)
Commit
7a988eed376372ea0a9e2931bfc36d3f14a85aee
Parent
6fd4c41eb90d3af…
1 file changed
+5
-5
+5
-5
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2179,26 +2179,26 @@ | ||
| 2179 | 2179 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2180 | 2180 | } |
| 2181 | 2181 | url_add_parameter(&url, "log", showLog ? "1" : "0"); |
| 2182 | 2182 | if( showLog ){ |
| 2183 | 2183 | style_submenu_element("Hide Log", "Hide Log", |
| 2184 | - url_render(&url, "log", "0", 0, 0)); | |
| 2184 | + "%s", url_render(&url, "log", "0", 0, 0)); | |
| 2185 | 2185 | }else{ |
| 2186 | 2186 | style_submenu_element("Show Log", "Show Log", |
| 2187 | - url_render(&url, "log", "1", 0, 0)); | |
| 2187 | + "%s", url_render(&url, "log", "1", 0, 0)); | |
| 2188 | 2188 | } |
| 2189 | 2189 | if( ann.bLimit ){ |
| 2190 | 2190 | char *z1, *z2; |
| 2191 | 2191 | style_submenu_element("All Ancestors", "All Ancestors", |
| 2192 | - url_render(&url, "limit", "-1", 0, 0)); | |
| 2192 | + "%s", url_render(&url, "limit", "-1", 0, 0)); | |
| 2193 | 2193 | z1 = sqlite3_mprintf("%d Ancestors", iLimit+20); |
| 2194 | 2194 | z2 = sqlite3_mprintf("%d", iLimit+20); |
| 2195 | - style_submenu_element(z1, z1, url_render(&url, "limit", z2, 0, 0)); | |
| 2195 | + style_submenu_element(z1, z1, "%s", url_render(&url, "limit", z2, 0, 0)); | |
| 2196 | 2196 | } |
| 2197 | 2197 | if( iLimit>20 ){ |
| 2198 | 2198 | style_submenu_element("20 Ancestors", "20 Ancestors", |
| 2199 | - url_render(&url, "limit", "20", 0, 0)); | |
| 2199 | + "%s", url_render(&url, "limit", "20", 0, 0)); | |
| 2200 | 2200 | } |
| 2201 | 2201 | if( db_get_boolean("white-foreground", 0) ){ |
| 2202 | 2202 | clr1 = 0xa04040; |
| 2203 | 2203 | clr2 = 0x4059a0; |
| 2204 | 2204 | }else{ |
| 2205 | 2205 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2179,26 +2179,26 @@ | |
| 2179 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2180 | } |
| 2181 | url_add_parameter(&url, "log", showLog ? "1" : "0"); |
| 2182 | if( showLog ){ |
| 2183 | style_submenu_element("Hide Log", "Hide Log", |
| 2184 | url_render(&url, "log", "0", 0, 0)); |
| 2185 | }else{ |
| 2186 | style_submenu_element("Show Log", "Show Log", |
| 2187 | url_render(&url, "log", "1", 0, 0)); |
| 2188 | } |
| 2189 | if( ann.bLimit ){ |
| 2190 | char *z1, *z2; |
| 2191 | style_submenu_element("All Ancestors", "All Ancestors", |
| 2192 | url_render(&url, "limit", "-1", 0, 0)); |
| 2193 | z1 = sqlite3_mprintf("%d Ancestors", iLimit+20); |
| 2194 | z2 = sqlite3_mprintf("%d", iLimit+20); |
| 2195 | style_submenu_element(z1, z1, url_render(&url, "limit", z2, 0, 0)); |
| 2196 | } |
| 2197 | if( iLimit>20 ){ |
| 2198 | style_submenu_element("20 Ancestors", "20 Ancestors", |
| 2199 | url_render(&url, "limit", "20", 0, 0)); |
| 2200 | } |
| 2201 | if( db_get_boolean("white-foreground", 0) ){ |
| 2202 | clr1 = 0xa04040; |
| 2203 | clr2 = 0x4059a0; |
| 2204 | }else{ |
| 2205 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2179,26 +2179,26 @@ | |
| 2179 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2180 | } |
| 2181 | url_add_parameter(&url, "log", showLog ? "1" : "0"); |
| 2182 | if( showLog ){ |
| 2183 | style_submenu_element("Hide Log", "Hide Log", |
| 2184 | "%s", url_render(&url, "log", "0", 0, 0)); |
| 2185 | }else{ |
| 2186 | style_submenu_element("Show Log", "Show Log", |
| 2187 | "%s", url_render(&url, "log", "1", 0, 0)); |
| 2188 | } |
| 2189 | if( ann.bLimit ){ |
| 2190 | char *z1, *z2; |
| 2191 | style_submenu_element("All Ancestors", "All Ancestors", |
| 2192 | "%s", url_render(&url, "limit", "-1", 0, 0)); |
| 2193 | z1 = sqlite3_mprintf("%d Ancestors", iLimit+20); |
| 2194 | z2 = sqlite3_mprintf("%d", iLimit+20); |
| 2195 | style_submenu_element(z1, z1, "%s", url_render(&url, "limit", z2, 0, 0)); |
| 2196 | } |
| 2197 | if( iLimit>20 ){ |
| 2198 | style_submenu_element("20 Ancestors", "20 Ancestors", |
| 2199 | "%s", url_render(&url, "limit", "20", 0, 0)); |
| 2200 | } |
| 2201 | if( db_get_boolean("white-foreground", 0) ){ |
| 2202 | clr1 = 0xa04040; |
| 2203 | clr2 = 0x4059a0; |
| 2204 | }else{ |
| 2205 |