[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-233-g5f1cef6

[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  5f1cef62327a4d8e5e1406c9822e6381c8490bde (commit)
      from  ff3c16272faf192690521674f318d20691c6ade1 (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=5f1cef62327a4d8e5e1406c9822e6381c8490bde


commit 5f1cef62327a4d8e5e1406c9822e6381c8490bde
Author: Daniele Forsi <address@hidden>
Date:   Wed Jun 1 19:09:46 2011 +0200

    Fix smsd segfaulting after sending failure
    
    Valgrind output:
    ==24063== Thread 2:
    ==24063== Invalid write of size 4
    ==24063==    at 0x805760F: sms_send_single (gsm-sms.c:1712)
    ==24063==    by 0x8057E9C: gn_sms_send (gsm-sms.c:1666)
    ==24063==    by 0x804DAF4: A_SendSMSMessage (lowlevel.c:292)
    ==24063==    by 0x804E0C4: RealConnect (lowlevel.c:396)
    ==24063==    by 0x804E3B6: Connect (lowlevel.c:477)
    ==24063==    by 0x427FCC8: start_thread (pthread_create.c:304)
    ==24063==    by 0x43B069D: clone (clone.S:130)
    ==24063==  Address 0x48450c0 is 0 bytes inside a block of size 4 free'd
    ==24063==    at 0x40257ED: free (vg_replace_malloc.c:366)
    ==24063==    by 0x804DB0A: A_SendSMSMessage (lowlevel.c:294)
    ==24063==    by 0x804E0C4: RealConnect (lowlevel.c:396)
    ==24063==    by 0x804E3B6: Connect (lowlevel.c:477)
    ==24063==    by 0x427FCC8: start_thread (pthread_create.c:304)
    ==24063==    by 0x43B069D: clone (clone.S:130)
    ==24063==
    ==24063== Invalid free() / delete / delete[]
    ==24063==    at 0x40257ED: free (vg_replace_malloc.c:366)
    ==24063==    by 0x804DB0A: A_SendSMSMessage (lowlevel.c:294)
    ==24063==    by 0x804E0C4: RealConnect (lowlevel.c:396)
    ==24063==    by 0x804E3B6: Connect (lowlevel.c:477)
    ==24063==    by 0x427FCC8: start_thread (pthread_create.c:304)
    ==24063==    by 0x43B069D: clone (clone.S:130)
    ==24063==  Address 0x48450c0 is 0 bytes inside a block of size 4 free'd
    ==24063==    at 0x40257ED: free (vg_replace_malloc.c:366)
    ==24063==    by 0x804DB0A: A_SendSMSMessage (lowlevel.c:294)
    ==24063==    by 0x804E0C4: RealConnect (lowlevel.c:396)
    ==24063==    by 0x804E3B6: Connect (lowlevel.c:477)
    ==24063==    by 0x427FCC8: start_thread (pthread_create.c:304)
    ==24063==    by 0x43B069D: clone (clone.S:130)

diff --git a/common/gsm-sms.c b/common/gsm-sms.c
index 7c6aa02..847dce6 100644
--- a/common/gsm-sms.c
+++ b/common/gsm-sms.c
@@ -1702,6 +1702,8 @@ static gn_error sms_send_single(gn_data *data, struct 
gn_statemachine *state)
 
        dprintf("Sending\n");
        error = gn_sm_functions(GN_OP_SendSMS, data, state);
+       if (error != GN_ERR_NONE)
+               return error;
 
        /* We send SMS parts from the first part to last. */
        if (!data->sms->reference)
@@ -1711,7 +1713,7 @@ static gn_error sms_send_single(gn_data *data, struct 
gn_statemachine *state)
                i++;
        data->sms->reference[i] = data->raw_sms->reference;
 
-       return error;
+       return GN_ERR_NONE;
 }
 
 static gn_error sms_send_long(gn_data *data, struct gn_statemachine *state, 
int octets)

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

Summary of changes:
 common/gsm-sms.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs