[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-522-g9c78cff

[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  9c78cff5411c66b1b379f9198af481bb12437970 (commit)
      from  5e076fd4665543dfbb8cec22703ce08ef824e3b9 (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=9c78cff5411c66b1b379f9198af481bb12437970


commit 9c78cff5411c66b1b379f9198af481bb12437970
Author: Daniele Forsi <address@hidden>
Date:   Wed May 1 16:54:37 2013 +0200

    Fix off-by-one bugs when encoding subentries
    
    Test case for number in subentry:
    echo "Test;+1;SM;100;0;11;0;4;+12" | gnokii --writephonebook --overwrite
    Test case for name in subentry (fails because phone doesn't support the 
name anyway):
    echo "Test;+1;SM;100;0;71;0;0;Family name" | gnokii --writephonebook 
--overwrite
    
    Fixes:
    ==8328== Use of uninitialised value of size 4
    ==8328==    at 0x44020D8: _itoa_word (_itoa.c:196)
    ==8328==    by 0x440598B: vfprintf (vfprintf.c:1622)
    ==8328==    by 0x4407BB1: buffered_vfprintf (vfprintf.c:2289)
    ==8328==    by 0x4402DC2: vfprintf (vfprintf.c:1309)
    ==8328==    by 0x807DE37: log_printf.part.0 (misc.c:369)
    ==8328==    by 0x43E2F73: __gconv_release_cache (gconv_cache.c:460)
    ==8328==  Uninitialised value was created by a stack allocation
    ==8328==    at 0x80A7A49: NK7110_WritePhonebookLocation (nk7110.c:857)
    ==8328==
    ==8328== Conditional jump or move depends on uninitialised value(s)
    ==8328==    at 0x44020E3: _itoa_word (_itoa.c:196)
    ==8328==    by 0x440598B: vfprintf (vfprintf.c:1622)
    ==8328==    by 0x4407BB1: buffered_vfprintf (vfprintf.c:2289)
    ==8328==    by 0x4402DC2: vfprintf (vfprintf.c:1309)
    ==8328==    by 0x807DE37: log_printf.part.0 (misc.c:369)
    ==8328==    by 0x43E2F73: __gconv_release_cache (gconv_cache.c:460)
    ==8328==  Uninitialised value was created by a stack allocation
    ==8328==    at 0x80A7A49: NK7110_WritePhonebookLocation (nk7110.c:857)
    ==8328==
    [...]

diff --git a/common/phones/nk7110.c b/common/phones/nk7110.c
index 58eefc6..efccdb0 100644
--- a/common/phones/nk7110.c
+++ b/common/phones/nk7110.c
@@ -916,13 +916,13 @@ static gn_error NK7110_WritePhonebookLocation(gn_data 
*data, struct gn_statemach
                                                j = 
strlen(entry->subentries[i].data.number);
                                                j = char_unicode_encode((string 
+ 5), entry->subentries[i].data.number, j);
                                                string[4] = j;
-                                               count += PackBlock(0x0b, j + 6, 
block++, string, req + count);
+                                               count += PackBlock(0x0b, j + 5, 
block++, string, req + count);
                                        }
                                } else {
                                        j = 
strlen(entry->subentries[i].data.number);
                                        j = char_unicode_encode((string + 1), 
entry->subentries[i].data.number, j);
                                        string[0] = j;
-                                       count += 
PackBlock(entry->subentries[i].entry_type, j + 2, block++, string, req + count);
+                                       count += 
PackBlock(entry->subentries[i].entry_type, j + 1, block++, string, req + count);
                                }
                }
                req[17] = block - 1;

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

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


hooks/post-receive
-- 
libgnokii and core programs