[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-157-ge6e9577

[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  e6e957719b2165512c594fdc1ea8b5cfffb44c23 (commit)
      from  d8463099b663223956376f0a11ed2cae3a51f92e (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=e6e957719b2165512c594fdc1ea8b5cfffb44c23


commit e6e957719b2165512c594fdc1ea8b5cfffb44c23
Author: Daniele Forsi <address@hidden>
Date:   Sun Jan 30 23:32:41 2011 +0100

    Do not silently clamp user input, do a range check instead.
    
    Previous code was also ineffective because the value was overwritten
    in the following line.

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 06e0156..90c0d34 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -3028,7 +3028,8 @@ static gn_error GetCallerBitmap(gn_data *data, struct 
gn_statemachine *state)
        /* You can only get logos which have been altered, */
        /* the standard logos can't be read!! */
 
-       req[15] = GNOKII_MIN(data->bitmap->number + 1, 
GN_PHONEBOOK_CALLER_GROUPS_MAX_NUMBER);
+       if (data->bitmap->number >= GN_PHONEBOOK_CALLER_GROUPS_MAX_NUMBER)
+               return GN_ERR_INVALIDLOCATION;
        req[15] = data->bitmap->number + 1;
        dprintf("Getting caller(%d) logo...\n", req[15]);
        SEND_MESSAGE_BLOCK(NK6510_MSG_PHONEBOOK, 18);

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

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


hooks/post-receive
-- 
libgnokii and core programs