summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-01-17 13:34:33 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-01-17 13:35:16 +0100
commit61009ee749a27c90d141e3d4b2ebaebe9934422d (patch)
tree8068dcd5fff0f085303bdaabdac1f01d5f26b935
parent7c77865564195d011287ba6887553fbca9212be4 (diff)
downloadgnutls-61009ee749a27c90d141e3d4b2ebaebe9934422d.tar.gz
opencdk: improved error code checking in the stream reading functions
This amends 49be4f7b82eba2363bb8d4090950dad976a77a3a Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--lib/opencdk/read-packet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index fa4c604d81..8055a63ed5 100644
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -917,11 +917,12 @@ read_new_length(cdk_stream_t inp,
(*r_size)++;
*r_len = ((c - 192) << 8) + c1 + 192;
} else if (c == 255) {
- *r_len = read_32(inp);
- if (*r_len == (u32)-1) {
+ c1 = read_32(inp);
+ if (c1 == (u32)-1) {
return;
}
+ *r_len = c1;
(*r_size) += 4;
} else {
*r_len = 1 << (c & 0x1f);