[GNUnet-SVN] [taler-merchant] branch master updated: fix two uninitialized memory accesses

[gnunet]

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

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 194c3c0  fix two uninitialized memory accesses
194c3c0 is described below

commit 194c3c0ef0b6173d01136bbd78409f4e356dfcec
Author: Florian Dold <address@hidden>
AuthorDate: Fri Feb 2 23:25:37 2018 +0100

    fix two uninitialized memory accesses
---
 src/backend/taler-merchant-httpd_proposal.c | 2 +-
 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
index 64bd5e9..1dffaf5 100644
--- 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
index 5a92e9c..c8ae9f8 100644
--- 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;

-- 
To stop receiving notification emails like this one, please contact
address@hidden