[taler-merchant] branch master updated: allow patch template to edit when image is null

[gnunet]

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

priscilla-huang pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new b55b9ebd allow patch template to edit when image is null
b55b9ebd is described below

commit b55b9ebd8bde3396d1dfe13e38e13d6c20a520ba
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Thu Feb 2 05:51:51 2023 -0500

    allow patch template to edit when image is null
---
 src/backend/taler-merchant-httpd_helper.c                     | 2 --
 src/backend/taler-merchant-httpd_private-patch-templates-ID.c | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_helper.c 
b/src/backend/taler-merchant-httpd_helper.c
index 56a11d94..22d82a0d 100644
--- a/src/backend/taler-merchant-httpd_helper.c
+++ b/src/backend/taler-merchant-httpd_helper.c
@@ -298,8 +298,6 @@ TMH_image_data_url_valid (const char *image_data_url)
   if (0 == strcmp (image_data_url,
                    ""))
     return true;
-  if (NULL == image_data_url)
-    return true;
   if (0 != strncasecmp ("data:image/",
                         image_data_url,
                         strlen ("data:image/")))
diff --git a/src/backend/taler-merchant-httpd_private-patch-templates-ID.c 
b/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
index 6cd060f0..b1116f62 100644
--- a/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
+++ b/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
@@ -145,8 +145,7 @@ TMH_private_patch_templates_ID (const struct 
TMH_RequestHandler *rh,
                                        "template_contract");
   }
 
-
-  if (! TMH_image_data_url_valid (tp.image))
+    if ((NULL != tp.image) && (! TMH_image_data_url_valid (tp.image)))
   {
     GNUNET_break_op (0);
     GNUNET_JSON_parse_free (spec);

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