From dac3e7103f2822b42ecbb58e40f70f7ccb802d42 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 18 Apr 2014 19:22:23 +0800 Subject: [PATCH] Add null pointer check in ctf_xfer_partial I find a gdb crash when gdb reads ctf trace. The crash is caused by passing NULL to strcmp. This patch is to add null pointer check, as what we did somewhere else in ctf.c. gdb: 2014-04-19 Yao Qi * ctf.c (ctf_xfer_partial): Check 'name' is NULL before strcmp. --- gdb/ChangeLog | 4 ++++ gdb/ctf.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 21907fabd0..2d2b839888 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2014-04-19 Yao Qi + + * ctf.c (ctf_xfer_partial): Check 'name' is NULL before strcmp. + 2014-04-18 Siva Chandra Reddy * valops.c (oload_method_static): Remove unnecessary argument diff --git a/gdb/ctf.c b/gdb/ctf.c index ebd40d6d83..b684a3603f 100644 --- a/gdb/ctf.c +++ b/gdb/ctf.c @@ -1399,7 +1399,7 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object, = bt_ctf_iter_read_event (ctf_iter); const char *name = bt_ctf_event_name (event); - if (strcmp (name, "frame") == 0) + if (name == NULL || strcmp (name, "frame") == 0) break; else if (strcmp (name, "memory") != 0) {