fixed GPF on malformated TDocVariantData.InitJson() input

synopse · Apr 8, 2022 · 9d929d3 · 9d929d3
1 parent bde31d9
commit 9d929d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/core/mormot.core.json.pas b/src/core/mormot.core.json.pas
@@ -134,7 +134,6 @@   EJsonException = class(ESynException);
 // - e.g. if contains " or \ characters, as defined by
 // http://www.ietf.org/rfc/rfc4627.txt
 function NeedsJsonEscape(const Text: RawUtf8): boolean; overload;
-  {$ifdef HASINLINE}inline;{$endif}
 
 /// returns TRUE if the given text buffers would be escaped when written as JSON
 // - e.g. if contains " or \ characters, as defined by
@@ -145,6 +144,7 @@ function NeedsJsonEscape(P: PUtf8Char): boolean; overload;
 // - e.g. if contains " or \ characters, as defined by
 // http://www.ietf.org/rfc/rfc4627.txt
 function NeedsJsonEscape(P: PUtf8Char; PLen: integer): boolean; overload;
+  {$ifdef HASINLINE}inline;{$endif}
 
 /// UTF-8 decode one or two \u#### JSON escaped codepoints into Dest
 // - P^ should point at 'u1234' just after \u1234
@@ -2334,7 +2334,7 @@   TCollectionItemAutoCreateFields = class(TCollectionItem)
   TSynJsonFileSettingsOptions = set of TSynJsonFileSettingsOption;
 
   /// abstract parent class able to store settings as JSON file
-  // - would fallback and try to read an .INI file if no valid JSON is found
+  // - would fallback and try to read as INI file if no valid JSON is found
   TSynJsonFileSettings = class(TSynAutoCreateFields)
   protected
     fInitialJsonContent: RawUtf8;

diff --git a/src/core/mormot.core.variants.pas b/src/core/mormot.core.variants.pas
@@ -5336,6 +5336,7 @@ function TDocVariantData.InitJsonInPlace(Json: PUtf8Char;
            begin
              VName := nil;
              VValue := nil;
+             exit;
            end
            else
              VCount := n;

diff --git a/src/mormot.commit.inc b/src/mormot.commit.inc
@@ -1 +1 @@
-'2.0.165'
+'2.0.166'