merchant

commit ca0fc7c0746cd355109bccf432b9ff78f34393e8
parent 97b02a22a9904c42d26e7973a82b9751e60f2135
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 22 Aug 2020 19:21:32 +0200

remove unnecessary h_contract support, fix free() of uninitialized variable

Diffstat:
M
src/lib/merchant_api_common.c
 | 
51
++++-----------------------------------------------

1 file changed, 4 insertions(+), 47 deletions(-)
diff --git a/src/lib/merchant_api_common.c b/src/lib/merchant_api_common.c
@@ -222,9 +222,9 @@ int
 TALER_MERCHANT_parse_pay_uri (const char *pay_uri,
                               struct TALER_MERCHANT_PayUriData *parse_data)
 {
-  char *path;
+  char *path = NULL;
   {
-    char *action;
+    char *action = NULL;
 
     if ((GNUNET_OK !=
          parse_taler_uri_scheme_action (pay_uri,
@@ -369,9 +369,9 @@ TALER_MERCHANT_parse_refund_uri (
   const char *refund_uri,
   struct TALER_MERCHANT_RefundUriData *parse_data)
 {
-  char *path;
+  char *path = NULL;
   {
-    char *action;
+    char *action = NULL;
 
     if ((GNUNET_OK !=
          parse_taler_uri_scheme_action (refund_uri,
@@ -415,49 +415,6 @@ TALER_MERCHANT_parse_refund_uri (
     *order_id = '\0';
     ++order_id;
 
-
-    {
-      char *ct_str = strchr (last_seg,
-                             '?');
-      char *ct_data;
-
-      if (NULL != ct_str)
-      {
-        *ct_str = '\0';
-        ++ct_str;
-
-        ct_data = strchr (ct_str,
-                          '=');
-        if (NULL == ct_data)
-        {
-          GNUNET_break_op (0);
-          GNUNET_free (path);
-          return GNUNET_SYSERR;
-        }
-        *ct_data = '\0';
-        ++ct_data;
-        if ((0 != strcmp ("h_contract",
-                          ct_str)) ||
-            (GNUNET_OK !=
-             GNUNET_STRINGS_string_to_data (ct_data,
-                                            strlen (ct_data),
-                                            &parse_data->h_contract,
-                                            sizeof (struct GNUNET_HashCode))))
-        {
-          GNUNET_break_op (0);
-          GNUNET_free (path);
-          return GNUNET_SYSERR;
-        }
-      }
-      else
-      {
-        memset (&parse_data->h_contract,
-                0,
-                sizeof (struct GNUNET_HashCode));
-      }
-    }
-
-
     ssid = strchr (last_seg,
                    '#');
     if (NULL != ssid)