[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-219-g77a010a

[Pawel Kot]

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  77a010ac46ab9cba1fb3ca7d6720a68f5a374e9d (commit)
      from  b6a0d35f7b3ac0a42949b2dbb275de64f23a4b90 (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=77a010ac46ab9cba1fb3ca7d6720a68f5a374e9d


commit 77a010ac46ab9cba1fb3ca7d6720a68f5a374e9d
Author: Pawel Kot <address@hidden>
Date:   Fri May 13 18:41:28 2011 +0200

    nk6510: avoid reported segfault when smsc information is read
    
    Reported problem:
    
    Program terminated with signal 11, Segmentation fault.
    [New process 18407]
    [New process 18408]
    [New process 18406]
       message=0x80e89f0 "\001|", length=58, data=0x81c6c98, state=0xb60a5008)
       at nk6510.c:1921
    1921                    data->message_center->id = message[8];
    
    Apparently the SMSC information was received and the caller didn't allocate
    the structure.

diff --git a/ChangeLog b/ChangeLog
index 056b0f0..66a103f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
     o fix calendar handling issues (few off-by-ones)    (Paweł Kot)
     o implement deletecalendarnote for series40 3rd+ Ed (Paweł Kot)
     o handle TODOs and Notes in series40 3rd+ Ed        (Paweł Kot)
+    o avoid segfault reported by Chuck when unexpected smsc
+      information arrives                               (Paweł Kot)
  * gnokii updates
     o create path to gnokii-errors even on Windows      (Paweł Kot)
     o allow to specify custom path for gnokii-errors    (Paweł Kot)
diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index c22801e..28d5a62 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -1920,6 +1920,11 @@ err:
                if (e != GN_ERR_NONE)
                        break;
 
+               if (!data->message_center) {
+                       dprintf("SMSC received but not expected\n");
+                       e = GN_ERR_INTERNALERROR;
+               }
+
                data->message_center->id = message[8];
                data->message_center->format = message[10];
                data->message_center->validity = message[12];  /* due to 
changes in format */

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

Summary of changes:
 ChangeLog              |    2 ++
 common/phones/nk6510.c |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs