[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-261-g4465199

[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  4465199e490721c05045a884200c46803b0e5e9b (commit)
      from  55cc8ca3d106515b938b6cf8e8e14a7b99e1f587 (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=4465199e490721c05045a884200c46803b0e5e9b


commit 4465199e490721c05045a884200c46803b0e5e9b
Author: Daniele Forsi <address@hidden>
Date:   Wed Jul 6 15:16:17 2011 +0200

    NUL terminate the string
    
    Original code in atgen.c uses the len variable to hold the length.
    Fixes:
    ==10317== Conditional jump or move depends on uninitialised value(s)
    ==10317==    at 0x4312B33: vfprintf (vfprintf.c:1614)
    ==10317==    by 0x4314511: buffered_vfprintf (vfprintf.c:2254)
    ==10317==    by 0x430F412: vfprintf (vfprintf.c:1306)
    ==10317==    by 0x43B65DC: __vfprintf_chk (vfprintf_chk.c:35)
    ==10317==    by 0x807FAAC: log_printf (stdio2.h:128)
    ==10317==    by 0x807FB55: gn_log_debug (misc.c:386)
    ==10317==    by 0x809503C: fake_writephonebook (fake.c:473)
    ==10317==    by 0x8055320: writephonebook (gnokii-phonebook.c:442)
    ==10317==    by 0x804C9B7: parse_options (gnokii.c:926)
    ==10317==    by 0x804C26B: parse_options (gnokii.c:858)
    ==10317==    by 0x804CE4E: main (gnokii.c:1234)
    ==10317==
    ==10317== Syscall param write(buf) points to uninitialised byte(s)
    ==10317==    at 0x4391F53: __write_nocancel (syscall-template.S:82)
    ==10317==    by 0x4339D5E: new_do_write (fileops.c:530)
    ==10317==    by 0x433A025: _IO_file_xsputn@@GLIBC_2.1 (fileops.c:1370)
    ==10317==    by 0x43145A7: buffered_vfprintf (vfprintf.c:2275)
    ==10317==    by 0x430F412: vfprintf (vfprintf.c:1306)
    ==10317==    by 0x43B65DC: __vfprintf_chk (vfprintf_chk.c:35)
    ==10317==    by 0x807FAAC: log_printf (stdio2.h:128)
    ==10317==    by 0x807FB55: gn_log_debug (misc.c:386)
    ==10317==    by 0x809503C: fake_writephonebook (fake.c:473)
    ==10317==    by 0x8055320: writephonebook (gnokii-phonebook.c:442)
    ==10317==    by 0x804C9B7: parse_options (gnokii.c:926)
    ==10317==    by 0x804C26B: parse_options (gnokii.c:858)
    ==10317==  Address 0xbef731fe is on thread 1's stack
    ==10317==

diff --git a/common/phones/fake.c b/common/phones/fake.c
index f4839a1..c347125 100644
--- a/common/phones/fake.c
+++ b/common/phones/fake.c
@@ -464,12 +464,12 @@ static gn_error fake_writephonebook(gn_data *data, struct 
gn_statemachine *state
                       number,
                       data->phonebook_entry->number[0] == '+' ? "145" : "129");
        tmp = req + ofs;
-       len = fake_encode(AT_CHAR_UCS2, tmp, sizeof(req) - ofs,
+       len = fake_encode(AT_CHAR_UCS2, tmp, sizeof(req) - ofs - 3,
                        data->phonebook_entry->name,
                        strlen(data->phonebook_entry->name));
        tmp[len-1] = '"';
        tmp[len++] = '\r';
-       len += ofs;
+       tmp[len] = '\0';
        dprintf("%s\n", req);
        return GN_ERR_NONE;
 }

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

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


hooks/post-receive
-- 
libgnokii and core programs