[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-380-g4c53ac4

[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  4c53ac4878f342b7271e82b94ffa668876c1a494 (commit)
      from  625bcaa442d94801a29f5f871ab02dc6eef3b383 (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=4c53ac4878f342b7271e82b94ffa668876c1a494


commit 4c53ac4878f342b7271e82b94ffa668876c1a494
Author: Daniele Forsi <address@hidden>
Date:   Wed Mar 7 18:49:06 2012 +0100

    Validate memory type
    
    Otherwise the driver will use 0xff as memory type.

diff --git a/common/phones/nk7110.c b/common/phones/nk7110.c
index f5130f0..88bcce0 100644
--- a/common/phones/nk7110.c
+++ b/common/phones/nk7110.c
@@ -767,6 +767,8 @@ static gn_error NK7110_GetMemoryStatus(gn_data *data, 
struct gn_statemachine *st
 
        dprintf("Getting memory status...\n");
        req[5] = get_memory_type(data->memory_status->memory_type);
+       if (req[5] == NK7110_MEMORY_XX)
+               return GN_ERR_INVALIDMEMORYTYPE;
        SEND_MESSAGE_BLOCK(NK7110_MSG_PHONEBOOK, 6);
 }
 
@@ -959,6 +961,8 @@ static gn_error NK7110_ReadPhonebookLL(gn_data *data, 
struct gn_statemachine *st
                                   0x00, 0x00, /* location */
                                   0x00, 0x00};
 
+       if (drvinst->ll_memtype == NK7110_MEMORY_XX)
+               return GN_ERR_INVALIDMEMORYTYPE;
        dprintf("Reading phonebook location (%d)\n", drvinst->ll_location);
 
        req[9] = drvinst->ll_memtype;

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

Summary of changes:
 common/phones/nk7110.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs