imagecache: id is 'int' type, correct the overflow, fixes #5016

diff --git a/src/channels.c b/src/channels.c
index d16898b8c1ff93fb1bf7d49851648cb746eecaac..cbff13baeb767576b213314c1bb91b6c769e5065 100644 (file)
--- a/src/channels.c
+++ b/src/channels.c
@@ -794,7 +794,7 @@ channel_get_icon ( channel_t *ch )
              *picon  = config.picon_path,
              *icon   = ch->ch_icon,
              *chname, *icn;
-  uint32_t id, i, pick, prefer = config.prefer_picon ? 1 : 0;
+  int id, i, pick, prefer = config.prefer_picon ? 1 : 0;
   char c;
 
   if (tvh_str_default(icon, NULL) == NULL)
@@ -1320,7 +1320,7 @@ channel_tag_get_icon(channel_tag_t *ct)
 {
   static char buf[64];
   const char *icon  = ct->ct_icon;
-  uint32_t id;
+  int id;
 
   /* Lookup imagecache ID */
   if ((id = imagecache_get_id(icon))) {

diff --git a/src/imagecache.c b/src/imagecache.c
index 6d4af571773d428f50434c63f63f9853fae8944f..2e349bfa8f3517ca0e83bdc44410ae50e48203bb 100644 (file)
--- a/src/imagecache.c
+++ b/src/imagecache.c
@@ -402,7 +402,7 @@ imagecache_init ( void )
   htsmsg_field_t *f;
   imagecache_image_t *img, *i;
   const char *url, *sha1;
-  uint32_t id;
+  int id;
 
   /* Init vars */
   imagecache_id             = 0;
@@ -450,8 +450,6 @@ imagecache_init ( void )
       }
       i = RB_INSERT_SORTED(&imagecache_by_id, img, id_link, id_cmp);
       assert(!i);
-      if (id > imagecache_id)
-        imagecache_id = id;
 #if ENABLE_IMAGECACHE
       if (!img->updated)
         imagecache_image_add(img);
@@ -593,10 +591,10 @@ imagecache_trigger( void )
 /*
  * Fetch a URLs ID
  */
-uint32_t
+int
 imagecache_get_id ( const char *url )
 {
-  uint32_t id = 0;
+  int id = 0;
   imagecache_image_t *i;
 
   lock_assert(&global_lock);
@@ -642,7 +640,7 @@ imagecache_get_id ( const char *url )
  * Get data
  */
 int
-imagecache_filename ( uint32_t id, char *name, size_t len )
+imagecache_filename ( int id, char *name, size_t len )
 {
   imagecache_image_t skel, *i;
   char *fn;

diff --git a/src/imagecache.h b/src/imagecache.h
index f4201bd9715ec2e8cdfea615ea6235d509e4a413..0bbc85297c7d4fea05eb43ab3190c9ad3245e3c1 100644 (file)
--- a/src/imagecache.h
+++ b/src/imagecache.h
@@ -42,8 +42,8 @@ void     imagecache_clean    ( void );
 void     imagecache_trigger  ( void );
 
 // Note: will return 0 if invalid (must serve original URL)
-uint32_t imagecache_get_id  ( const char *url );
+int      imagecache_get_id  ( const char *url );
 
-int      imagecache_filename ( uint32_t id, char *name, size_t len );
+int      imagecache_filename ( int id, char *name, size_t len );
 
 #endif /* __IMAGE_CACHE_H__ */