merchant

commit 979e9d380d6169034f9f426a3b2b050ac4907200
parent f1395b9cd50df28853cd138557b41ddd79b4ecd3
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  4 Jun 2017 22:49:51 +0200

fix more leaks, failure to reset job ptr when done

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

2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_proposal.c b/src/backend/taler-merchant-httpd_proposal.c
@@ -435,25 +435,23 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
                                            "order_id");
 
   res = db->find_contract_terms (db->cls,
-                                &contract_terms,
-                                order_id,
-                                &mi->pubkey);
+                                 &contract_terms,
+                                 order_id,
+                                 &mi->pubkey);
   if (GNUNET_NO == res)
     return TMH_RESPONSE_reply_not_found (connection,
                                          TALER_EC_PROPOSAL_LOOKUP_NOT_FOUND,
                                          "unknown transaction id");
-
   if (GNUNET_SYSERR == res)
     return TMH_RESPONSE_reply_internal_error (connection,
                                               TALER_EC_PROPOSAL_LOOKUP_DB_ERROR,
                                               "An error occurred while retrieving proposal data from db");
 
-
-  return TMH_RESPONSE_reply_json (connection,
-                                  contract_terms,
-                                  MHD_HTTP_OK);
-
-
+  res = TMH_RESPONSE_reply_json (connection,
+                                 contract_terms,
+                                 MHD_HTTP_OK);
+  json_decref (contract_terms);
+  return res;
 }
 
 
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
@@ -271,6 +271,7 @@ handle_proposal_lookup_finished (void *cls,
 {
   struct TALER_MERCHANT_ProposalLookupOperation *plo = cls;
 
+  plo->job = NULL;
   /**
    * As no data is supposed to be extracted from this
    * call, we just invoke the provided callback.