[GNUnet-SVN] [taler-merchant] branch master updated: oops, fix use before initialization

[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 15518f0  oops, fix use before initialization
15518f0 is described below

commit 15518f077f9955d04de58c8041370372a7d0475b
Author: Florian Dold <address@hidden>
AuthorDate: Mon Aug 26 01:30:28 2019 +0200

    oops, fix use before initialization
---
 src/backend/taler-merchant-httpd_check-payment.c | 31 ++++++++++++------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_check-payment.c 
b/src/backend/taler-merchant-httpd_check-payment.c
index b0d380f..b4526b1 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -363,6 +363,22 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
   GNUNET_assert (NULL != contract_terms);
   GNUNET_assert (NULL != last_session_id);
 
+  if (GNUNET_OK !=
+      TALER_JSON_hash (contract_terms,
+                       &h_contract_terms))
+  {
+    GNUNET_break (0);
+    json_decref (contract_terms);
+    GNUNET_free (last_session_id);
+    GNUNET_free (final_contract_url);
+    return TMH_RESPONSE_reply_internal_error (connection,
+                                              
TALER_EC_CHECK_PAYMENT_FAILED_COMPUTE_PROPOSAL_HASH,
+                                              "Failed to hash proposal");
+  }
+
+  h_contract_terms_str = GNUNET_STRINGS_data_to_string_alloc 
(&h_contract_terms,
+                                                              sizeof (struct 
GNUNET_HashCode));
+
   if ( (NULL != session_id) && (0 != strcmp (session_id, last_session_id)) )
   {
 
@@ -379,21 +395,6 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
     return ret;
   }
 
-  if (GNUNET_OK !=
-      TALER_JSON_hash (contract_terms,
-                       &h_contract_terms))
-  {
-    GNUNET_break (0);
-    json_decref (contract_terms);
-    GNUNET_free (last_session_id);
-    GNUNET_free (final_contract_url);
-    return TMH_RESPONSE_reply_internal_error (connection,
-                                              
TALER_EC_CHECK_PAYMENT_FAILED_COMPUTE_PROPOSAL_HASH,
-                                              "Failed to hash proposal");
-  }
-
-  h_contract_terms_str = GNUNET_STRINGS_data_to_string_alloc 
(&h_contract_terms,
-                                                              sizeof (struct 
GNUNET_HashCode));
 
   /* Check if paid */
   {

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