summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-11-05 00:48:24 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-11-20 01:06:31 +0100
commitfb19f64d6188e9baeba938d7c64ec99cc06f1162 (patch)
tree1ec0e3cb69706d737154748850831ced82adaa14
parenta3a8c029ba77e16730b366e084444c9a393cfe92 (diff)
downloadneard-fb19f64d6188e9baeba938d7c64ec99cc06f1162.tar.gz
neard-fb19f64d6188e9baeba938d7c64ec99cc06f1162.tar.bz2
neard-fb19f64d6188e9baeba938d7c64ec99cc06f1162.zip
nfctool: Fix snep-decode potential overflow
Code review done by Sebastian Krahmer <krahmer@suse.de>.
-rw-r--r--tools/nfctool/snep-decode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/nfctool/snep-decode.c b/tools/nfctool/snep-decode.c
index 27d3c1e..bee06e5 100644
--- a/tools/nfctool/snep-decode.c
+++ b/tools/nfctool/snep-decode.c
@@ -159,6 +159,8 @@ static int snep_decode_info(struct sniffer_packet *packet)
}
frag = g_malloc(sizeof(struct snep_frag));
+ if (!frag)
+ return -ENOMEM;
frag->count = 1;
@@ -167,6 +169,8 @@ static int snep_decode_info(struct sniffer_packet *packet)
frag->received = packet->snep.real_len;
frag->buffer = g_malloc0(frag->buffer_size);
+ if (!frag->buffer)
+ return -ENOMEM;
memcpy(frag->buffer, packet->snep.data, packet->snep.real_len);