diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-04-24 21:05:16 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-04-24 21:05:16 +0200 |
| commit | 338895460158b98d3f8dfc4512e6b8d165d1aae5 (patch) | |
| tree | a473b7ee54c8504ebd002dcb872be6008f054226 /src/backend/taler-merchant-httpd_private-post-instances.c | |
| parent | 88bed1df5b0c23ef743d201c68a57cb56694cbb2 (diff) | |
| download | merchant-338895460158b98d3f8dfc4512e6b8d165d1aae5.tar.gz merchant-338895460158b98d3f8dfc4512e6b8d165d1aae5.tar.bz2 merchant-338895460158b98d3f8dfc4512e6b8d165d1aae5.zip | |
misc fixes
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-post-instances.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-instances.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/taler-merchant-httpd_private-post-instances.c b/src/backend/taler-merchant-httpd_private-post-instances.c index 6309d762..609753f1 100644 --- a/src/backend/taler-merchant-httpd_private-post-instances.c +++ b/src/backend/taler-merchant-httpd_private-post-instances.c @@ -246,6 +246,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, if (! json_is_array (payto_uris)) { + GNUNET_break_op (0); payto_ok = false; len = 0; } @@ -260,6 +261,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, if (! json_is_string (payto_uri)) { + GNUNET_break_op (0); payto_ok = false; break; } @@ -271,6 +273,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, if (json_equal (payto_uri, old_uri)) { + GNUNET_break_op (0); payto_ok = false; break; } @@ -286,7 +289,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, &salt, sizeof (salt)); wm = GNUNET_new (struct TMH_WireMethod); - wm->j_wire = json_pack ("{s:s, s:o}", + wm->j_wire = json_pack ("{s:O, s:o}", "payto_uri", payto_uri, "salt", GNUNET_JSON_from_data_auto (&salt)); GNUNET_assert (NULL != wm->j_wire); @@ -295,6 +298,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, TALER_JSON_merchant_wire_signature_hash (wm->j_wire, &wm->h_wire)) { + GNUNET_break_op (0); payto_ok = false; GNUNET_free (wm); break; @@ -372,7 +376,8 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, GNUNET_JSON_spec_string ("payto_uri", &ad.payto_uri), GNUNET_JSON_spec_fixed_auto ("salt", - &ad.salt) + &ad.salt), + GNUNET_JSON_spec_end () }; GNUNET_assert (GNUNET_OK == @@ -393,6 +398,8 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, goto retry; } qs = TMH_db->commit (TMH_db->cls); + if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) + qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; retry: if (GNUNET_DB_STATUS_SOFT_ERROR != qs) break; /* success! -- or hard failure */ |