aboutsummaryrefslogtreecommitdiff
path: root/src/mint/taler-mint-httpd_admin.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-09-27 20:32:30 +0200
committerChristian Grothoff <christian@grothoff.org>2015-09-27 20:32:30 +0200
commitbf8b9d1435a196c9b7c3293904da2a3baba7210a (patch)
treeb722367def8d35bff70938db77323de61efd0348 /src/mint/taler-mint-httpd_admin.c
parenta67fefa9fbcf9774d277a9c94aeebdf78d2051d1 (diff)
parent1bfba318ec0f3393de2dfc66821dec6165eef90a (diff)
downloadexchange-bf8b9d1435a196c9b7c3293904da2a3baba7210a.tar.gz
exchange-bf8b9d1435a196c9b7c3293904da2a3baba7210a.tar.bz2
exchange-bf8b9d1435a196c9b7c3293904da2a3baba7210a.zip
mention need to audit randomness of gamma
Diffstat (limited to 'src/mint/taler-mint-httpd_admin.c')
-rw-r--r--src/mint/taler-mint-httpd_admin.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mint/taler-mint-httpd_admin.c b/src/mint/taler-mint-httpd_admin.c
index 299ffa00b..373c444a1 100644
--- a/src/mint/taler-mint-httpd_admin.c
+++ b/src/mint/taler-mint-httpd_admin.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014 GNUnet e.V.
+ Copyright (C) 2014, 2015 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free Software
@@ -136,19 +136,22 @@ TMH_ADMIN_handler_admin_add_incoming (struct TMH_RequestHandler *rh,
res = TMH_PARSE_json_data (connection,
root,
spec);
+ json_decref (root);
if (GNUNET_OK != res)
{
+<<<<<<< HEAD
GNUNET_break_op (0);
json_decref (root);
+=======
+>>>>>>> 1bfba318ec0f3393de2dfc66821dec6165eef90a
return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
}
if (GNUNET_YES !=
- TALER_json_validate_wireformat (TMH_expected_wire_format,
+ TALER_json_validate_wireformat (TMH_expected_wire_formats,
wire))
{
GNUNET_break_op (0);
TMH_PARSE_release_data (spec);
- json_decref (root);
return TMH_RESPONSE_reply_arg_unknown (connection,
"wire");
}
@@ -158,7 +161,6 @@ TMH_ADMIN_handler_admin_add_incoming (struct TMH_RequestHandler *rh,
at,
wire);
TMH_PARSE_release_data (spec);
- json_decref (root);
return res;
}