From 38c08145712dd3b6eb53f158d3bd0fda1ffbc5e3 Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Fri, 28 Aug 2009 12:22:29 +0200 Subject: [PATCH] Fix segfault on getsms and deletesms when raw_sms->number < 1 Bug reported on the mailing list when smsd tries to read location 0: http://lists.gnu.org/archive/html/gnokii-users/2009-08/msg00064.html --- ChangeLog | 3 +++ common/phones/nk7110.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6215d32..317efa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,6 +144,9 @@ * utils updates o add gnokii-configure utility (not installed by make install because it depends on Python and libglade) (Daniele Forsi) + * nk7110 driver updates + o fix segfault on getsms and deletesms when raw_sms->number < 1 + (Daniele Forsi) 0.6.27 ====== diff --git a/common/phones/nk7110.c b/common/phones/nk7110.c index bec50dc..973382e 100644 --- a/common/phones/nk7110.c +++ b/common/phones/nk7110.c @@ -1239,6 +1239,9 @@ static gn_error ValidateSMS(gn_data *data, struct gn_statemachine *state) { gn_error error; + if (data->raw_sms->number < 1) + return GN_ERR_INVALIDLOCATION; + /* Handle memory_type = 0 explicitely, because sms_folder->folder_id = 0 by default */ if (data->raw_sms->memory_type == 0) return GN_ERR_INVALIDMEMORYTYPE; -- 1.6.0.4