complete P2P/W2W conflict handling, deduplicate code across handlers

1 files changed, 15 insertions, 0 deletions

diff --git a/src/exchange/taler-exchange-httpd_batch-withdraw.c b/src/exchange/taler-exchange-httpd_batch-withdraw.c
index d1311f8a..52f42036 100644
--- a/src/exchange/taler-exchange-httpd_batch-withdraw.c
+++ b/src/exchange/taler-exchange-httpd_batch-withdraw.c
@@ -456,6 +456,21 @@ parse_planchets (const struct TEH_RequestContext *rc,
         return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
     }
     pc->collectable.reserve_pub = *wc->reserve_pub;
+    for (unsigned int k = 0; k<i; k++)
+    {
+      const struct PlanchetContext *kpc = &wc->planchets[k];
+
+      if (0 ==
+          TALER_blinded_planchet_cmp (&kpc->blinded_planchet,
+                                      &pc->blinded_planchet))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                           "duplicate planchet");
+      }
+    }
   }
 
   ksh = TEH_keys_get_state ();