[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-91-g3ebc309

[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  3ebc3096c0a035d1d0fc2f605a45811516e48f50 (commit)
      from  712ffaccb06b12966b7d0d5839e0f21cfd2bedb8 (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=3ebc3096c0a035d1d0fc2f605a45811516e48f50


commit 3ebc3096c0a035d1d0fc2f605a45811516e48f50
Author: Pawel Kot <address@hidden>
Date:   Mon Jan 17 23:15:29 2011 +0100

    Avoid segfault with gn_cfg_phone_load() when state is not initialized.

diff --git a/ChangeLog b/ChangeLog
index 9bcbb1f..dc0b6fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
       that should be compliant with the lagrer number of the
       devices                                 (Msquared, Paweł Kot)
     o use libiconv on WIN32                             (Paweł Kot)
+       o avoid segfault with gn_cfg_phone_load() when state is not
+         initialized                                       (Paweł Kot)
  * nk6510 driver updates
     o fix parsing SMS date from saved messages, bug #29830
                                                         (Paweł Kot)
diff --git a/common/cfgreader.c b/common/cfgreader.c
index d665642..96e4b21 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1,7 +1,5 @@
 /*
 
-  $Id$
-
   G N O K I I
 
   A Linux/Unix toolset and driver for the mobile phones.
@@ -26,7 +24,7 @@
   Copyright (C) 1999-2000 Hugh Blemings & Pavel Janik ml.
   Copyright (C) 2000      Jan Derfinak
   Copyright (C) 2001      Jan Kratochvil
-  Copyright (C) 2001-2009 Pawel Kot
+  Copyright (C) 2001-2011 Pawel Kot
   Copyright (C) 2002-2004 BORBELY Zoltan
   Copyright (C) 2005      Bastien Nocera
 
@@ -1146,6 +1144,9 @@ GNOKII_API gn_error gn_cfg_phone_load(const char *iname, 
struct gn_statemachine
        char section[256];
        gn_error error;
 
+       if (!state)
+               return GN_ERR_INTERNALERROR;
+
        if (iname == NULL || *iname == '\0') {
                state->config = gn_config_global;
        } else {

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

Summary of changes:
 ChangeLog          |    2 ++
 common/cfgreader.c |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs