From c1343b3278cdf99533b7902744d15969f9d6fdc1 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Wed, 2 Jan 2013 14:18:20 +0100 Subject: Imported Upstream version 5.0.1 --- src/medsrv/controller/peer_controller.c | 0 src/medsrv/controller/peer_controller.h | 0 src/medsrv/controller/user_controller.c | 6 +++++- src/medsrv/controller/user_controller.h | 0 4 files changed, 5 insertions(+), 1 deletion(-) mode change 100755 => 100644 src/medsrv/controller/peer_controller.c mode change 100755 => 100644 src/medsrv/controller/peer_controller.h mode change 100755 => 100644 src/medsrv/controller/user_controller.c mode change 100755 => 100644 src/medsrv/controller/user_controller.h (limited to 'src/medsrv/controller') diff --git a/src/medsrv/controller/peer_controller.c b/src/medsrv/controller/peer_controller.c old mode 100755 new mode 100644 diff --git a/src/medsrv/controller/peer_controller.h b/src/medsrv/controller/peer_controller.h old mode 100755 new mode 100644 diff --git a/src/medsrv/controller/user_controller.c b/src/medsrv/controller/user_controller.c old mode 100755 new mode 100644 index 12bd938fe..35c9d90c8 --- a/src/medsrv/controller/user_controller.c +++ b/src/medsrv/controller/user_controller.c @@ -64,7 +64,11 @@ static chunk_t hash_password(char *login, char *password) } data = chunk_cata("cc", chunk_create(login, strlen(login)), chunk_create(password, strlen(password))); - hasher->allocate_hash(hasher, data, &hash); + if (!hasher->allocate_hash(hasher, data, &hash)) + { + hasher->destroy(hasher); + return chunk_empty; + } hasher->destroy(hasher); return hash; } diff --git a/src/medsrv/controller/user_controller.h b/src/medsrv/controller/user_controller.h old mode 100755 new mode 100644 -- cgit v1.2.3