tyls: Make sure we never divide by zero

Avoid the case where cols is 0 and we divide through it. CID 1100655
main: Free config before shutdown.
2014-02-26 10:46:42 +01:00 · 2014-02-26 10:46:42 +01:00 · 2014-02-26 10:46:42 +01:00 · 2014-02-26 10:46:42 +01:00
4 changed files with 4 additions and 2 deletions
--- a/src/bin/main.c
+++ b/src/bin/main.c
@ -3059,6 +3059,7 @@ remote:

   config_del(main_config);
   config_shutdown();
+   config_del(config);
   eina_log_domain_unregister(_log_domain);
   _log_domain = -1;

--- a/src/bin/options_wallpaper.c
+++ b/src/bin/options_wallpaper.c
@ -132,7 +132,7 @@ _grid_content_get(void *data, Evas_Object *obj, const char *part)
                                                      config->theme);
             o = elm_layout_add(obj);
             oe = elm_layout_edje_get(o);
-             edje_object_file_set(oe, path, "terminology/background");
+             if (!edje_object_file_set(oe, path, "terminology/background")) return NULL;
             evas_object_show(o);
             return o;
         }
--- a/src/bin/tyls.c
+++ b/src/bin/tyls.c
@ -640,6 +640,7 @@ list_dir(const char *dir, int mode)
             stuff--;
          }
        if (cols > num) cols = num;
+        if (cols == 0) cols = 1;
        rows = ((num + (cols - 1)) / cols);
        for (i = 0; i < rows; i++)
          {
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@ -37,7 +37,7 @@ theme_reload(Evas_Object *edje)

   edje_object_file_get(edje, &file, &group);
   INF("file=%s, group=%s", file, group);
-   edje_object_file_set(edje, file, group);
+   if (!edje_object_file_set(edje, file, group)) return;
 }

 static void
Author	SHA1	Message	Date
Stefan Schmidt	8ae31617a1	tyls: Make sure we never divide by zero Avoid the case where cols is 0 and we divide through it. CID 1100655	2014-02-26 10:46:42 +01:00
Stefan Schmidt	2e95700161	main: Free config before shutdown. While it technically is a leak it does not really matter much as it happens on shutdown. Better fix it anyway. CID 1100644	2014-02-26 10:46:42 +01:00
Stefan Schmidt	7e03c55c2a	utils: Check retrun value of edje_object_file_set In this case it not really useful as the functions returns void and this is the last instruction anyway. Still better to have this in to set good examples in the code. CID 1100661	2014-02-26 10:46:42 +01:00
Stefan Schmidt	921c713b40	options_wallpaper: Check retrun value of edje_object_file_set edje_object_file_set can fail. Better check for the return value and act accordingly. CID 1147527	2014-02-26 10:46:42 +01:00