merchant

commit 194c3c0ef0b6173d01136bbd78409f4e356dfcec
parent 1ae3bdf7ba9eeaba387aa7fd1bd5aa1362f6752f
Author: Florian Dold <florian.dold@gmail.com>
Date:   Fri,  2 Feb 2018 23:25:37 +0100

fix two uninitialized memory accesses

Diffstat:
M
src/backend/taler-merchant-httpd_proposal.c
 | 
2
+-
M
src/lib/test_merchant_api.c
 | 
1
+

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_proposal.c b/src/backend/taler-merchant-httpd_proposal.c
@@ -567,7 +567,7 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
   enum GNUNET_DB_QueryStatus qs;
   json_t *contract_terms;
   struct MerchantInstance *mi;
-  char *last_session_id;
+  char *last_session_id = NULL;
 
   instance = MHD_lookup_connection_value (connection,
                                           MHD_GET_ARGUMENT_KIND,
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
@@ -1595,6 +1595,7 @@ proposal_lookup_initial_cb (void *cls,
   if (cmd->expected_response_code != http_status)
   {
     fail (is);
+    return;
   }
 
   cmd->details.proposal.hash = *hash;