From 6142524b7040c66114edc6648d4128fe18f109e9 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 7 Mar 2026 02:36:39 +0000 Subject: [PATCH] The optional SQLITE_DECIMAL_MAX_DIGIT compile-time option limits the maximum number of digits that the decimal extension will operate on. FossilOrigin-Name: 4214485b2fe4b95d9440008158d458b4b957a111f201965de1a518623589fd79 --- ext/misc/decimal.c | 16 ++++++++++++++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ext/misc/decimal.c b/ext/misc/decimal.c index e6adb20e8b..e2709b3017 100644 --- a/ext/misc/decimal.c +++ b/ext/misc/decimal.c @@ -164,6 +164,9 @@ static Decimal *decimalNewFromText(const char *zIn, int n){ for(i=0; inDigit && p->a[i]==0; i++){} if( i>=p->nDigit ) p->sign = 0; } +#if SQLITE_DECIMAL_MAX_DIGIT+0>10 + if( p->nDigit>SQLITE_DECIMAL_MAX_DIGIT ) goto new_from_text_failed; +#endif return p; new_from_text_failed: @@ -463,6 +466,9 @@ static void decimal_expand(Decimal *p, int nDigit, int nFrac){ nAddFrac = nFrac - p->nFrac; nAddSig = (nDigit - p->nDigit) - nAddFrac; if( nAddFrac==0 && nAddSig==0 ) return; +#if SQLITE_DECIMAL_MAX_DIGIT+0>10 + if( nDigit+1>SQLITE_DECIMAL_MAX_DIGIT ){ p->oom = 1; return; } +#endif p->a = sqlite3_realloc64(p->a, nDigit+1); if( p->a==0 ){ p->oom = 1; @@ -562,14 +568,20 @@ static void decimalMul(Decimal *pA, Decimal *pB){ signed char *acc = 0; int i, j, k; int minFrac; + sqlite3_int64 sumDigit; if( pA==0 || pA->oom || pA->isNull || pB==0 || pB->oom || pB->isNull ){ goto mul_end; } - acc = sqlite3_malloc64( (sqlite3_int64)pA->nDigit + - (sqlite3_int64)pB->nDigit + 2 ); + sumDigit = pA->nDigit; + sumDigit += pB->nDigit; + sumDigit += 2; +#if SQLITE_DECIMAL_MAX_DIGIT+0>10 + if( sumDigit>SQLITE_DECIMAL_MAX_DIGIT ){ pA->oom = 1; return; } +#endif + acc = sqlite3_malloc64( sumDigit ); if( acc==0 ){ pA->oom = 1; goto mul_end; diff --git a/manifest b/manifest index d6e68ba3ab..de3dc9b203 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Reenable\sthe\sis_base85()\sextension\sfunction\sthat\swas\sdisabled\nby\s[af18b68978ec9b1f]. -D 2026-03-07T00:14:36.107 +C The\soptional\sSQLITE_DECIMAL_MAX_DIGIT\scompile-time\soption\slimits\sthe\nmaximum\snumber\sof\sdigits\sthat\sthe\sdecimal\sextension\swill\soperate\son. +D 2026-03-07T02:36:39.331 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -370,7 +370,7 @@ F ext/misc/completion.c 99589a9f04113e9a169312d132730131963451a30abd6704d7808623 F ext/misc/compress.c 8191118b9b73e7796c961790db62d35d9b0fb724b045e005a5713dc9e0795565 F ext/misc/csv.c e82124eabee0e692d7b90ab8b2c34fadbf7b375279f102567fa06e4da4b771bf F ext/misc/dbdump.c 678f1b9ae2317b4473f65d03132a2482c3f4b08920799ed80feedd2941a06680 -F ext/misc/decimal.c caba30af5af57f3227353905265fe471a65c6cb8b8f9a99a073681efb5ab967c +F ext/misc/decimal.c 30cefa0e3324a5378cd92338ca76b4fd2f4bdd9412d28c8d8749767e64780397 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1 F ext/misc/explain.c 606100185fb90d6a1eade1ed0414d53503c86820d8956a06e3b0a56291894f2b F ext/misc/fileio.c 33165b3cd99f83dcd333a338eb51491f6b01c8d96cb6ae81f96a6a096834e030 @@ -2189,8 +2189,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P c4843e4cce71acb1e3743c45e0ee8cf62e91c39b57cec4f356bf7a4a10f81352 -R c5fa0800e812db087ddb1eb453804f3f +P be07c16e3a7d28b95bea4b987a880d5b4b2b44d9a31ac5b48caa5b6c6dc5bec3 +R fb41484273ea6a90bfb888fdbf07d432 U drh -Z 89905c27e4448987191e485f141a5327 +Z 8c85ca12d73e44b1162bbbb4c821fd82 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cbd33e7ca3..b03d21fbe1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -be07c16e3a7d28b95bea4b987a880d5b4b2b44d9a31ac5b48caa5b6c6dc5bec3 +4214485b2fe4b95d9440008158d458b4b957a111f201965de1a518623589fd79 -- 2.47.3