diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
commit | 7a994c9631c590d6a73c842fa5d2d3567b4771dd (patch) | |
tree | 228ade01f99ba217151a0ed20f29c5f3a5028619 /src/mds-server/interception-condition.c | |
parent | mds-kbdc: compile-layout: macro_call: fix bug: do not duplicate the arguments if there are none (diff) | |
parent | report an error, rather than causing failure the caller but not for the called function (diff) | |
download | mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.gz mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.bz2 mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.xz |
merge track-errors and resolve conflict
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r-- | src/mds-server/interception-condition.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mds-server/interception-condition.c b/src/mds-server/interception-condition.c index 31905c9..cfe5d0c 100644 --- a/src/mds-server/interception-condition.c +++ b/src/mds-server/interception-condition.c @@ -71,10 +71,11 @@ size_t interception_condition_unmarshal(interception_condition_t* restrict this, buf_get_next(data, int64_t, this->priority); buf_get_next(data, int, this->modifying); n = (strlen(data) + 1) * sizeof(char); - if ((this->condition = malloc(n)) == NULL) - return 0; + fail_if ((this->condition = malloc(n)) == NULL); memcpy(this->condition, data, n); return sizeof(size_t) + sizeof(int64_t) + 2 * sizeof(int) + n; + fail: + return 0; } |