channel: fix ch_number type, might fix crashes and numbers > 2000

tvheadend · Sep 12, 2014 · ea9d782 · ea9d782
1 parent 9a1fc69
commit ea9d782
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/channels.h b/src/channels.h
@@ -47,10 +47,10 @@ typedef struct channel
   int ch_zombie;
 
   /* Channel info */
-  char *ch_name; // Note: do not access directly!
-  int   ch_number;
-  char *ch_icon;
-  struct channel_tag_mapping_list ch_ctms;
+  char   *ch_name; // Note: do not access directly!
+  int64_t ch_number;
+  char   *ch_icon;
+  struct  channel_tag_mapping_list ch_ctms;
 
   /* Service/subscriptions */
   LIST_HEAD(, channel_service_mapping) ch_services;

diff --git a/src/prop.c b/src/prop.c
@@ -152,7 +152,7 @@ prop_write_values
           char *s;
           if (!(new = htsmsg_field_get_str(f)))
             continue;
-          s64 = atol(new) * p->intsplit;
+          s64 = (int64_t)atol(new) * p->intsplit;
           if ((s = strchr(new, '.')) != NULL)
             s64 += (atol(s + 1) % p->intsplit);
         } else {