[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-506-gb91e6fc

[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  b91e6fc36c2af28bee1b49c51d636c87b99d0677 (commit)
      from  6177d1cbb2c0bb4975221cd6b0b78dd86ce979a6 (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=b91e6fc36c2af28bee1b49c51d636c87b99d0677


commit b91e6fc36c2af28bee1b49c51d636c87b99d0677
Author: Daniele Forsi <address@hidden>
Date:   Sun Apr 28 20:40:41 2013 +0200

    Move the check just before data->file_list is used
    
    This way there is a chance to print more debug messages.
    No need to check data->file because it isn't used by the code below
    this point and is checked above anyway.

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 50f6688..9dc4907 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -2522,11 +2522,6 @@ static gn_error NK6510_IncomingFile(int messagetype, 
unsigned char *message, int
                }
                break;
        case 0x15: /* Answer for GetFileDetailsById */
-               if (!data->file || !data->file_list) {
-                       error = GN_ERR_INTERNALERROR;
-                       dprintf("error!\n");
-                       goto out;
-               }
                switch (message[4]) {
                case 0x04:
                        error = GN_ERR_EMPTYLOCATION;
@@ -2586,6 +2581,11 @@ static gn_error NK6510_IncomingFile(int messagetype, 
unsigned char *message, int
                        dprintf("unknown file\n");
                }
 
+               if (!data->file_list) {
+                       error = GN_ERR_INTERNALERROR;
+                       dprintf("error!\n");
+                       goto out;
+               }
                data->file_list->file_count = 0;
                j = 0;
                if (length > 0xe8) {

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

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


hooks/post-receive
-- 
libgnokii and core programs