[exim-cvs] Fix json extract operator for unfound case

Gitweb: https://git.exim.org/exim.git/commitdiff/b13354a7c428fdb2286d2227fdad5378a1ee9426

Commit:     b13354a7c428fdb2286d2227fdad5378a1ee9426
Parent:     9669c6e06fa8441557a70ba0759eda19287681ad
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Jan 10 13:05:10 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jan 10 15:24:00 2019 +0000

    Fix json extract operator for unfound case
---
 doc/doc-docbook/spec.xfpt    | 7 ++++++-
 src/src/expand.c             | 2 ++
 test/scripts/0000-Basic/0002 | 3 +++
 test/stdout/0002             | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index a164835..7d4dfbb 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -6628,9 +6628,10 @@ of the JSON structure.
If a selector is numeric, it must apply to a JSON array; the (zero-based)
nunbered array element is selected.
Otherwise it must apply to a JSON object; the named element is selected.
-The final resulting object can be a simple JSOM type or a JSON object
+The final resulting element can be a simple JSON type or a JSON object
or array; for the latter two a string-representation os the JSON
is returned.
+For elements of type string, the returned value is de-quoted.
.wen
.next
.cindex "linear search"
@@ -9424,6 +9425,8 @@ The expanded <&'string1'&> must be of the form:
The braces, commas and colons, and the quoting of the member name are required;
the spaces are optional.
Matching of the key against the member names is done case-sensitively.
+If a returned value is a JSON string, it retains its leading and
+trailing quotes.
. XXX should be a UTF-8 compare

The results of matching are handled as above.
@@ -9471,6 +9474,8 @@ apart from leading and trailing white space, which is ignored.

Field selection and result handling is as above;
there is no choice of field separator.
+If a returned value is a JSON string, it retains its leading and
+trailing quotes.
.wen


diff --git a/src/src/expand.c b/src/src/expand.c
index d6fd848..2f05737 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -3894,6 +3894,7 @@ return NULL;
a copy in an allocated string. Update the list pointer.

The element may itself be an abject or array.
+Return NULL when the list is empty.
*/

 uschar *
@@ -3915,6 +3916,7 @@ for (item = s;
     case '}': object_depth--; break;
     }
 *list = *s ? s+1 : s;
+if (item == s) return NULL;
 item = string_copyn(item, s - item);
 DEBUG(D_expand) debug_printf_indent("  json ele: '%s'\n", item);
 return US item;
diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index e192a55..7a9b38d 100644
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -902,6 +902,9 @@ expect: {"1":116, "2":943, "3":234}
 ${extract json{IDs}{ \{"id": \{"a":101, "b":102\}, "IDs": \{"1":116, "2":943, "3":234\}\} }}
 expect: {"1":116, "2":943, "3":234}

+<${extract json{nonexistent}{ \{"id": \{"a":101, "b":102\}, "IDs": \{"1":116, "2":943, "3":234\}\} }}>
+expect: <>
+
****
# Test "escape" with print_topbitchars
exim -be -DPTBC=print_topbitchars
diff --git a/test/stdout/0002 b/test/stdout/0002
index 949c35e..44117a9 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -845,6 +845,9 @@ xyz
> {"1":116, "2":943, "3":234}
> expect: {"1":116, "2":943, "3":234}
>
+> Failed: missing '"' wrapping string key for extract json
+> expect: <>
+>
>
> escape: B7?F2?
>