summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------contrib/gana0
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.c4
-rw-r--r--src/util/lang.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/contrib/gana b/contrib/gana
-Subproject 32acd55e3d886322dab80bfbed4e73f59001347
+Subproject 9d38f712c153727dbb895673d6d9841be57c12c
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index 2d80d03a..e963928d 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -2501,7 +2501,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
- TALER_EC_KEYS_HAVE_NOT_NUMERIC,
+ TALER_EC_KEYS_HAVE_NOT_NUMERIC, // FIXME: use more GENERIC code!
have_cherrypick);
}
/* The following multiplication may overflow; but this should not really
@@ -2530,7 +2530,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN,
- TALER_EC_KEYS_HAVE_NOT_NUMERIC,
+ TALER_EC_KEYS_HAVE_NOT_NUMERIC, // FIXME: use more GENERIC code!
have_fakenow);
}
if (TEH_allow_keys_timetravel)
diff --git a/src/util/lang.c b/src/util/lang.c
index 3f6a4291..ffc50a55 100644
--- a/src/util/lang.c
+++ b/src/util/lang.c
@@ -50,6 +50,8 @@ TALER_language_matches (const char *language_pattern,
char *qp = strtok_r (NULL, ";", &sptr2);
double q = 1.0;
+ if (NULL == lp)
+ continue; /* should be impossible, but makes static analysis happy */
while (isspace ((int) *lp))
lp++;
if (NULL != qp)