diff options
| author | larrybr <larrybr@noemail.net> | 2023-03-25 01:29:40 +0000 |
|---|---|---|
| committer | larrybr <larrybr@noemail.net> | 2023-03-25 01:29:40 +0000 |
| commit | 86b67f09e7587249d53fdce35c70ce459bb68ad7 (patch) | |
| tree | a9b44b118783d595abfb8049a2e3187c7aed311e | |
| parent | 62e43b25ddfa12f970a6f818d4942aeac8838f65 (diff) | |
| download | sqlite-86b67f09e7587249d53fdce35c70ce459bb68ad7.tar.gz sqlite-86b67f09e7587249d53fdce35c70ce459bb68ad7.zip | |
Fix CLI non-handling of OOM reported at [forum:/forumpost/6872514e04|Forum post 6872514e04].
FossilOrigin-Name: 6f6a0fd63b13cb827d6a402de01a701eb5b3f92954032ea80e78ec864861a26c
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/shell.c.in | 1 |
3 files changed, 9 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Remove\sundocumented,\svestigial\sSQL\sfunctions\sin\sthe\sCLI\sthat\swere\sonce\sused\nfor\sthe\s".recover"\scommand\sbut\sare\snow\sno\slonger\sneeded. -D 2023-03-24T22:17:59.908 +C Fix\sCLI\snon-handling\sof\sOOM\sreported\sat\s[forum:/forumpost/6872514e04|Forum\spost\s6872514e04]. +D 2023-03-25T01:29:40.329 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 83812448cf5a645f37d79c43fa92d38d7a9f7790d95f7ac09ac02b4064810bd2 -F src/shell.c.in 3ae753373f8031b4a7d4258293d458cfbe807c69d94c513189b7b2884dc4909e +F src/shell.c.in d80b53a9ec0a43ac0157fc54d667cb49fb6dd2229558135530feab2fc04b909d F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4 @@ -2051,8 +2051,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 6211471138a654641a4cf4831cfa3b470e06f29a2b77e4d58177c8e065bec11e -R d74b6f5e7ca51ba8ce014f3390bf47fc -U drh -Z 0874726345819af3ee3fcb8bd20f97a4 +P 1ef461aa4e95d254c2c1edebbbfd92ca96d752e04f68ebe70104e8d936d36be9 +R fbdb1a010f49bcb705fde9b123ee05a5 +U larrybr +Z 701892f33d4b936af4ab128b00443fae # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 87becb129..bc8d2726a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1ef461aa4e95d254c2c1edebbbfd92ca96d752e04f68ebe70104e8d936d36be9
\ No newline at end of file +6f6a0fd63b13cb827d6a402de01a701eb5b3f92954032ea80e78ec864861a26c
\ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index c61a7432f..594efc456 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -2089,6 +2089,7 @@ static void printSchemaLine(FILE *out, const char *z, const char *zTail){ int i; for(i=0; i<ArraySize(azTerm); i++){ char *zNew = sqlite3_mprintf("%s%s;", zOrig, azTerm[i]); + shell_check_oom(zNew); if( sqlite3_complete(zNew) ){ size_t n = strlen(zNew); zNew[n-1] = 0; |