Fossil SCM

Make sure the SQLite memory allocator is initialized before trying to use it to convert MBCS into UTF8.

drh 2012-12-01 03:18 UTC cmdline-expansion
Commit cc09cda247c9f8442872a69830fc83bab5a182e1
1 file changed +1
+1
--- src/main.c
+++ src/main.c
@@ -372,10 +372,11 @@
372372
WCHAR buf[MAX_PATH];
373373
#endif
374374
375375
g.argc = argc;
376376
g.argv = argv;
377
+ sqlite3_initialize();
377378
#if defined(_WIN32) && defined(BROKEN_MINGW_CMDLINE)
378379
for(i=0; i<g.argc; i++) g.argv[i] = fossil_mbcs_to_utf8(g.argv[i]);
379380
#else
380381
for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
381382
#endif
382383
--- src/main.c
+++ src/main.c
@@ -372,10 +372,11 @@
372 WCHAR buf[MAX_PATH];
373 #endif
374
375 g.argc = argc;
376 g.argv = argv;
 
377 #if defined(_WIN32) && defined(BROKEN_MINGW_CMDLINE)
378 for(i=0; i<g.argc; i++) g.argv[i] = fossil_mbcs_to_utf8(g.argv[i]);
379 #else
380 for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
381 #endif
382
--- src/main.c
+++ src/main.c
@@ -372,10 +372,11 @@
372 WCHAR buf[MAX_PATH];
373 #endif
374
375 g.argc = argc;
376 g.argv = argv;
377 sqlite3_initialize();
378 #if defined(_WIN32) && defined(BROKEN_MINGW_CMDLINE)
379 for(i=0; i<g.argc; i++) g.argv[i] = fossil_mbcs_to_utf8(g.argv[i]);
380 #else
381 for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
382 #endif
383

Keyboard Shortcuts

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