[EGIT] [core/enlightenment] enlightenment-0.22 24/45: protect against null deref when emitting efm/eeze error messages

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.22.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=96a67811a1d4bbed7fc1c2014d3f08e1e2048961

commit 96a67811a1d4bbed7fc1c2014d3f08e1e2048961
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jan 8 10:41:45 2018 -0500

    protect against null deref when emitting efm/eeze error messages
    
    CID 1382954
---
 src/bin/e_fm/e_fm_main_eeze.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index 0383e8860..baac5dfa5 100644
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -108,14 +108,17 @@ _e_fm_main_eeze_format_error_msg(char     **buf,
    char *tmp;
 
    vu = strlen(v->udi) + 1;
-   vm = strlen(v->mount_point) + 1;
+   vm = (v->mount_point ? strlen(v->mount_point) : 0) + 1;
    en = strlen(name) + 1;
    size = vu + vm + en + strlen(msg) + 1;
    tmp = *buf = malloc(size);
 
    strcpy(tmp, v->udi);
    tmp += vu;
-   strcpy(tmp, v->mount_point);
+   if (v->mount_point)
+     strcpy(tmp, v->mount_point);
+   else
+     tmp[0] = 0;
    tmp += vm;
    strcpy(tmp, name);
    tmp += en;

--