[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-384-g12b1971

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  12b19710512e5fbe5ce7e7d7ed3733b72597b61a (commit)
      from  fff1282e5e96b32f66d57c35e74676b0563cb844 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=12b19710512e5fbe5ce7e7d7ed3733b72597b61a


commit 12b19710512e5fbe5ce7e7d7ed3733b72597b61a
Author: Daniele Forsi <address@hidden>
Date:   Fri Mar 9 11:26:42 2012 +0100

    Validate the location number passed to GN_OP_GetRawRingtone in nk6100.c
    
    This is because the FBUS frame uses one octect for the location.
    Note that locations 0..16 are wrapped to 238..255 as before since
    the driver subtracts 17 from the passed value.

diff --git a/common/phones/nk6100.c b/common/phones/nk6100.c
index d54cb10..b4b9e49 100644
--- a/common/phones/nk6100.c
+++ b/common/phones/nk6100.c
@@ -2996,7 +2996,8 @@ static gn_error GetRawRingtone(gn_data *data, struct 
gn_statemachine *state)
        gn_error error;
 
        if (!data || !data->ringtone || !data->raw_data) return 
GN_ERR_INTERNALERROR;
-       if (data->ringtone->location < 0) return GN_ERR_INVALIDLOCATION;
+       if (data->ringtone->location < 0 || data->ringtone->location > 255)
+               return GN_ERR_INVALIDLOCATION;
 
        req[3] = data->ringtone->location - 17;
 

-----------------------------------------------------------------------

Summary of changes:
 common/phones/nk6100.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs