Attachment 780332 Details for Bug 989851 – Bad patch, ignore

[patch] Bad patch, ignore

gpsbabel-svn4488-garmin_fit.cc.patch (text/plain), 1.67 KB, created by Conrad Meyer on 2013-07-30 05:15:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Conrad Meyer

Created: 2013-07-30 05:15:38 UTC

Size: 1.67 KB

patch

obsolete

>Index: garmin_fit.cc
>===================================================================
>--- garmin_fit.cc	(revision 4488)
>+++ garmin_fit.cc	(working copy)
>@@ -170,48 +170,51 @@
>   if (fit_data.len < 4) {
>     fatal(MYNAME ": record truncated: expecting char[4], but only got %d\n",fit_data.len);
>   }
>   is_fatal(gbfread(buf, 4, 1, fin) != 1,
>            MYNAME ": unexpected end of file with fit_data.len=%d\n",fit_data.len);
>   fit_data.len -= 4;
>   if (fit_data.endian) {
>     return be_read32(buf);
>   } else {
>     return le_read32(buf);
>   }
> 
> }
> 
> static void
> fit_parse_definition_message(uint8_t header)
> {
>   int local_id = header & 0x1f;
>   fit_message_def* def = &fit_data.message_def[local_id];
>   int i;
>+  uint8_t reserved;
> 
>   if (def->fields) {
>     free(def->fields);
>   }
> 
>   // first byte is reserved
>-  is_fatal(fit_getuint8() != 0,
>-           MYNAME ": Definition message reserved bits not zero\n");
>+  reserved = fit_getuint8();
>+  if (reserved != 0) {
>+    warning("%s: Definition message reserved bits not zero: %#hhx\n", MYNAME, reserved);
>+  }
> 
>   // second byte is endianness
>   def->endian = fit_getuint8();
>   if (def->endian > 1) {
>     fatal(MYNAME ": Bad endian field\n");
>   }
>   fit_data.endian = def->endian;
> 
>   // next two bytes are the global message number
>   def->global_id = fit_getuint16();
> 
>   // byte 5 has the number of records in the remainder of the definition message
>   def->num_fields = fit_getuint8();
>   if (global_opts.debug_level >= 8) {
>     debug_print(8,"%s: definition message contains %d records\n",MYNAME, def->num_fields);
>   }
>   if (def->num_fields == 0) {
>     def->fields = (fit_field_t*) xmalloc(sizeof(fit_field_t));
>     return;
>   }

Actions: View | Diff

Attachments on bug 989851: 780327 | 780332 | 780934