Apply SAFE_STRLCPY

Change-Id: I2e5d1d19292b1116125f55bb8a3ba9a09552196e

diff --git a/common/include/mm_util_private.h b/common/include/mm_util_private.h
index 49c726a..ea4f20c 100755 (executable)
--- a/common/include/mm_util_private.h
+++ b/common/include/mm_util_private.h
@@ -38,6 +38,8 @@ extern "C" {
 #define MMUTIL_SAFE_STRCPY(dst, src, n)        g_strlcpy(dst, src, n)
 #define MMUTIL_STRING_VALID(str)       ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)
 
+#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
+
 /* for alignment */
 #define MM_UTIL_ROUND_UP_2(num) (((num)+1)&~1)
 #define MM_UTIL_ROUND_UP_4(num) (((num)+3)&~3)

diff --git a/magick/mm_util_info.c b/magick/mm_util_info.c
index 19377bc..82db411 100755 (executable)
--- a/magick/mm_util_info.c
+++ b/magick/mm_util_info.c
@@ -229,7 +229,7 @@ static int _ImgGetFileExt(const char *path, char *file_ext, int max_len)
 
        for (i = (int)strlen(path); i >= 0; i--) {
                if ((path[i] == '.') && (i < (int)strlen(path))) {
-                       strncpy(file_ext, &path[i + 1], max_len);
+                       SAFE_STRLCPY(file_ext, &path[i + 1], max_len);
                        return MM_UTIL_ERROR_NONE;
                }
 

diff --git a/magick/mm_util_magick.c b/magick/mm_util_magick.c
index 1b19241..6660502 100755 (executable)
--- a/magick/mm_util_magick.c
+++ b/magick/mm_util_magick.c
@@ -284,7 +284,7 @@ static int __mm_util_write_image_to_file(ImageInfo *image_info, Image *image, co
 
        GetExceptionInfo(&exception);
 
-       strncpy(image->filename, out_path, sizeof(image->filename));
+       SAFE_STRLCPY(image->filename, out_path, sizeof(image->filename));
        image->filename[MaxTextExtent-1] = '\0';
 
        AddDefinition(image_info, "jpeg", "dct-method", "FASTEST", &exception);