oec/libbrandt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BRANDT_new() returns NULL on parameter failure

Browse Source
This commit is contained in:
Markus Teich 2016-11-22 00:29:27 +01:00
parent 1e83436746
commit e9d1c7ba00
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
brandt.c
View File

@ -181,17 +181,22 @@ BRANDT_new (BRANDT_CbResult result,
uint16_t m, uint16_t m,
int outcome_public) int outcome_public)
{ {
struct BRANDT_Auction *ret = GNUNET_new (struct BRANDT_Auction); struct BRANDT_Auction *ret;
struct BRANDT_DescrP *desc = GNUNET_new (struct BRANDT_DescrP); struct BRANDT_DescrP *desc;
struct GNUNET_HashContext *hc = GNUNET_CRYPTO_hash_context_start (); struct GNUNET_HashContext *hc;
struct GNUNET_TIME_Relative until_start; struct GNUNET_TIME_Relative until_start;
if (0 == num_prices)
return NULL;
desc = GNUNET_new (struct BRANDT_DescrP);
desc->time_start = GNUNET_TIME_absolute_hton (time_start); desc->time_start = GNUNET_TIME_absolute_hton (time_start);
desc->time_round = GNUNET_TIME_relative_hton (time_round); desc->time_round = GNUNET_TIME_relative_hton (time_round);
desc->description_len = htonl (description_len); desc->description_len = htonl (description_len);
desc->k = htons (num_prices); desc->k = htons (num_prices);
desc->m = htons (m); desc->m = htons (m);
desc->outcome_public = htons (outcome_public); desc->outcome_public = htons (outcome_public);
hc = GNUNET_CRYPTO_hash_context_start ();
GNUNET_CRYPTO_hash_context_read (hc, GNUNET_CRYPTO_hash_context_read (hc,
&desc->time_start, &desc->time_start,
sizeof (*desc) - sizeof (desc->hash)); sizeof (*desc) - sizeof (desc->hash));
@ -200,6 +205,7 @@ BRANDT_new (BRANDT_CbResult result,
description_len); description_len);
GNUNET_CRYPTO_hash_context_finish (hc, &desc->hash); GNUNET_CRYPTO_hash_context_finish (hc, &desc->hash);
ret = GNUNET_new (struct BRANDT_Auction);
ret->time_start = time_start; ret->time_start = time_start;
ret->time_round = time_round; ret->time_round = time_round;
ret->k = num_prices; ret->k = num_prices;

3
brandt.h
View File

@ -211,7 +211,8 @@ BRANDT_join (BRANDT_CbResult result,
* @param[in] outcome_public If 1, the auction winner and price will be public * @param[in] outcome_public If 1, the auction winner and price will be public
* to all participants, if 0, this information will only be revealed to the * to all participants, if 0, this information will only be revealed to the
* winner and the seller. * winner and the seller.
* @return A pointer, which should only be remembered and passed to * @return If invalid parameters are passed, NULL is returned. Else the return
* value is a pointer, which should only be remembered and passed to
* libbrandt functions when the client needs to refer to this auction. This is a * libbrandt functions when the client needs to refer to this auction. This is a
* black-box pointer, do NOT dereference/change it or the data it points to! * black-box pointer, do NOT dereference/change it or the data it points to!
*/ */