Bug fix in the randomjson.c extension.

FossilOrigin-Name: 1f3a33df530dbe330ea8b14a69369b807b413b25a167d1a3938f8f0faf97cc91

diff --git a/ext/misc/randomjson.c b/ext/misc/randomjson.c
index d64eb693273b6e279afe4694543ad2e2a18cc91c..20ee12b9fe913892b58a1b84a7c2a3fa32851ccd 100644 (file)
--- a/ext/misc/randomjson.c
+++ b/ext/misc/randomjson.c
@@ -138,11 +138,7 @@ static void jsonExpand(
   char zBuf[200];
 
   j = 0;
-  if( zSrc==0 ){
-    k = prngInt(p)%(count(azJsonTemplate)/2);
-    k = k*2 + eType;
-    zSrc = azJsonTemplate[k];
-  }
+  if( zSrc==0 ) zSrc = "%";
   if( strlen(zSrc)>=STRSZ/10 ) r = 0;
   for(i=0; zSrc[i]; i++){
     if( zSrc[i]!='%' ){
@@ -182,6 +178,8 @@ static void jsonExpand(
         zX = strstr(zX, "DD");
       }
     }
+    assert( strstr(z, "XX")==0 );
+    assert( strstr(z, "DD")==0 );
     if( j+n<STRSZ ){
       memcpy(&zDest[j], z, n);
       j += (int)n;

diff --git a/manifest b/manifest
index 707ec351dcb6b42ad2d492cb43312ab72c11657e..7141e85632185a32e4dcaa85296d17d478e30e50 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\sext/misc/randomjson.c.
-D 2023-12-18T12:18:47.579
+C Bug\sfix\sin\sthe\srandomjson.c\sextension.
+D 2023-12-18T13:51:54.496
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -394,7 +394,7 @@ F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee
 F ext/misc/percentile.c b9086e223d583bdaf8cb73c98a6539d501a2fc4282654adbfea576453d82e691
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
-F ext/misc/randomjson.c 5cc576ac9d246912ca5617c30c032d71a314f909e79b77720b92a110af5a143e
+F ext/misc/randomjson.c 8642d0ce204de743f148c11b320f4493046bf2a57f79efb19be3388101a7d092
 F ext/misc/regexp.c 4bdd0045912f81c84908bd535ec5ad3b1c8540b4287c70ab84070963624047db
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
@@ -2154,8 +2154,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 70620405ab01d6a5d38bafa9ae175fd6e4eabaf2efb7854734278dafd7b05c99
-R fef455adeb3db15e87f82c26ab2a315d
+P a4e6d1f86f3a502e4170f5a90031e269e48363e95114a66b84d373e3ce0b2704
+R 9787f93b49de93cd2fa8fe010120ae0d
 U drh
-Z 8e07af0f91951d15e8de4bbc66cf6fcc
+Z 72d64dbdca15edf4ed5cc684c21af296
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index af4ff6ee3b5693bbce559ea96a8a2f4708cfb49b..c6d3735f6ad6939d0e441e73ba04dc84bbfd7949 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4e6d1f86f3a502e4170f5a90031e269e48363e95114a66b84d373e3ce0b2704
\ No newline at end of file
+1f3a33df530dbe330ea8b14a69369b807b413b25a167d1a3938f8f0faf97cc91
\ No newline at end of file