[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: fix more leaks, fai
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: fix more leaks, failure to reset job ptr when done |
Date: |
Sun, 04 Jun 2017 22:49:53 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 979e9d3 fix more leaks, failure to reset job ptr when done
979e9d3 is described below
commit 979e9d380d6169034f9f426a3b2b050ac4907200
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jun 4 22:49:51 2017 +0200
fix more leaks, failure to reset job ptr when done
---
src/backend/taler-merchant-httpd_proposal.c | 18 ++++++++----------
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
index 7a1cabb..e2332ef 100644
--- 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
index 7eddeaf..84f7045 100644
--- 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.
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: fix more leaks, failure to reset job ptr when done,
gnunet <=