[taler-merchant] branch master updated: fix #5930

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 85a0221  fix #5930
85a0221 is described below

commit 85a02216d8a1926f2a528e0bae64c76410a6263d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jul 6 10:52:24 2020 +0200

    fix #5930
---
 src/backend/taler-merchant-httpd_private-post-orders.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c 
b/src/backend/taler-merchant-httpd_private-post-orders.c
index 06fd562..5ccad64 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -673,8 +673,17 @@ patch_order (struct MHD_Connection *connection,
 
 
   /* Fill in merchant information if necessary */
-  if (NULL == json_object_get (order,
+  if (NULL != json_object_get (order,
                                "merchant"))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_BAD_REQUEST,
+      TALER_EC_PROPOSAL_ORDER_PARSE_ERROR,
+      "'merchant' field already set, but must be provided by backend");
+  }
+  else
   {
     const char *mj = NULL;
     const char *ma = NULL;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.