[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-134-gdb5b2a1

[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  db5b2a1c9c54c7135717ad5b08f698ca96b0a851 (commit)
      from  3b82d67a950fc337779206864aa4a4a3c714131b (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=db5b2a1c9c54c7135717ad5b08f698ca96b0a851


commit db5b2a1c9c54c7135717ad5b08f698ca96b0a851
Author: Pawel Kot <address@hidden>
Date:   Thu Jan 27 15:13:15 2011 +0100

    Fix:
    
    UNHANDLED FRAME RECEIVED
    request: 0x1f / 0x0009
    00 01 00 07 00 00 fe 00 7d                      |         }
    reply: 0x1f / 0x0022
    01 4a 00 08 00 01 00 1c 00 64 02 01 00 0a 00 4e |  J       d     N
    00 6f 00 6b 00 69 00 61 00 20 00 74 00 75 00 6e |  o k i a   t u n
    00 65                                           |  e
    
    message[i + 4] is equal 0x02 in series40 3rd ed+

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 0cb0bca..f4a4ae4 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -4495,19 +4495,21 @@ static gn_error NK6510_IncomingRingtone(int 
messagetype, unsigned char *message,
 {
        int i, j, n;
        unsigned char *pos;
-       gn_ringtone_list *rl;
+       gn_ringtone_list *rl = data->ringtone_list;
 
        switch (message[3]) {
        case 0x08:
                dprintf("List of ringtones received!\n");
-               if (!(rl = data->ringtone_list)) return GN_ERR_INTERNALERROR;
+               if (!rl)
+                       return GN_ERR_INTERNALERROR;
                rl->count = 256 * message[4] + message[5];
                rl->userdef_location = NK6510_RINGTONE_USERDEF_LOCATION;
                rl->userdef_count = 10;
                if (rl->count > GN_RINGTONE_MAX_COUNT) rl->count = 
GN_RINGTONE_MAX_COUNT;
                i = 6;
                for (j = 0; j < rl->count; j++) {
-                       if (message[i + 4] != 0x01 || message[i + 6] != 0x00) 
return GN_ERR_UNHANDLEDFRAME;
+                       if ((message[i + 4] != 0x01 && message[i + 4] != 0x02) 
|| message[i + 6] != 0x00)
+                               return GN_ERR_UNHANDLEDFRAME;
                        rl->ringtone[j].location = 256 * message[i + 2] + 
message[i + 3];
                        rl->ringtone[j].user_defined = (message[i + 5] == 0x02);
                        rl->ringtone[j].readable = 1;

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

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


hooks/post-receive
-- 
libgnokii and core programs