summaryrefslogtreecommitdiff
path: root/gallery-utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'gallery-utils.c')
-rw-r--r--gallery-utils.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/gallery-utils.c b/gallery-utils.c
index a11273b..9642116 100644
--- a/gallery-utils.c
+++ b/gallery-utils.c
@@ -68,8 +68,7 @@ str_replace (char **dst, const char *search, const char *replace, const char *ex
/* TODO: add range checking */
- if (strstr (*dst, search) == NULL || strlen (*dst) == 0 ||
- strlen (search) == 0 || strlen (replace) == 0)
+ if (strstr (*dst, search) == NULL || strlen (*dst) == 0 || strlen (search) == 0)
return;
i = 0;
@@ -84,8 +83,10 @@ str_replace (char **dst, const char *search, const char *replace, const char *ex
}
/* copy replace string instead */
- memcpy (&d[i], replace, strlen (replace));
- i += strlen (replace);
+ if (strlen (replace) > 0) {
+ memcpy (&d[i], replace, strlen (replace));
+ i += strlen (replace);
+ }
src = found + strlen (search);
}