gnokii ChangeLog common/phones/nk6510.c

[Pawel Kot]

CVSROOT:        /cvsroot/gnokii
Module name:    gnokii
Changes by:     Pawel Kot <pkot>        06/06/18 20:59:36

Modified files:
        .              : ChangeLog 
        common/phones  : nk6510.c 

Log message:
        Fix nk6510 driver getfiledetailsbyid off-by-four bug

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnokii/ChangeLog?cvsroot=gnokii&r1=1.1203&r2=1.1204
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/phones/nk6510.c?cvsroot=gnokii&r1=1.214&r2=1.215

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnokii/gnokii/ChangeLog,v
retrieving revision 1.1203
retrieving revision 1.1204
diff -u -b -r1.1203 -r1.1204
--- ChangeLog   18 Jun 2006 16:57:06 -0000      1.1203
+++ ChangeLog   18 Jun 2006 20:59:36 -0000      1.1204
@@ -1,3 +1,8 @@
+0.6.99 (Not released yet)
+=========================
+ * nk6510 driver updates
+    o fix getfiledetailsbyid (off-by-four bug)          (Pawel Kot)
+
 0.6.13
 ======
  * xgnokii updates

Index: common/phones/nk6510.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/phones/nk6510.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- common/phones/nk6510.c      17 Jun 2006 20:33:05 -0000      1.214
+++ common/phones/nk6510.c      18 Jun 2006 20:59:36 -0000      1.215
@@ -1,6 +1,6 @@
 /*
 
-  $Id: nk6510.c,v 1.214 2006/06/17 20:33:05 pkot Exp $
+  $Id: nk6510.c,v 1.215 2006/06/18 20:59:36 pkot Exp $
 
   G N O K I I
 
@@ -1911,7 +1911,7 @@
                        /* first 4 octets are for the length */
                        /* next 4 octets are for the type (?) */
                        /* then pairs (len, location) */
-                       for (i = 250; i < length ;) {
+                       for (i = 250; i + 4 < length ;) {
                                int k, len = 2 * (message[i] * 256 + 
message[i+1]);
                                data->file_list->file_count++;
                                data->file_list->files[j] = calloc(1, 
sizeof(gn_file));