[EGIT] [apps/ephoto] master 01/01: Ephoto: Fix crash uploading edited images

[Stephen Houston]

okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=8c4f8c2696968128a0f6daa0196cff0b58c4179a

commit 8c4f8c2696968128a0f6daa0196cff0b58c4179a
Author: Stephen Houston <smhousto...@gmail.com>
Date:   Sun Nov 1 10:55:10 2015 -0600

    Ephoto: Fix crash uploading edited images
---
 src/bin/ephoto_single_browser.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index bba7f37..39b4203 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -1265,7 +1265,7 @@ _upload_image_confirm(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info
    Evas_Object *ppopup = data;
    Evas_Object *popup, *box, *label, *pb;
    Ephoto_Single_Browser *sb = evas_object_data_get(ppopup, "single_browser");
-   char buf[PATH_MAX];
+   char buf[PATH_MAX], tmp_path[PATH_MAX];
    FILE *f;
    unsigned char *fdata;
    int fsize;
@@ -1302,7 +1302,26 @@ _upload_image_confirm(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info
    elm_object_part_content_set(popup, "default", box);
    evas_object_show(popup);
 
-   f = fopen(sb->entry->path, "rb");
+   if (sb->edited_image_data)
+     {
+        const char *ext = strrchr(sb->entry->path, '.');
+        Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
+        Eina_Bool success;
+
+        ext++;
+        snprintf(tmp_path, PATH_MAX, "%s/.config/ephoto/tmp.%s", 
getenv("HOME"), ext);
+        success = evas_object_image_save(elm_image_object_get(v->image), 
tmp_path, NULL, NULL);
+        if (!success)
+          {
+             _failed_save(sb);
+             return;
+          }
+        f = fopen(tmp_path, "rb");
+     }
+   else
+     {
+        f = fopen(sb->entry->path, "rb");
+     }
    fseek(f, 0, SEEK_END);
    fsize = ftell(f);
    rewind(f);
@@ -1310,6 +1329,9 @@ _upload_image_confirm(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info
    fread(fdata, fsize, 1, f);
    fclose(f);
 
+   if (sb->edited_image_data && tmp_path)
+     ecore_file_unlink(tmp_path);
+
    snprintf(buf, PATH_MAX, "image=%u", fdata);
 
    sb->handlers = eina_list_append

--