diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ipc/media-thumb-ipc.c | 6 | ||||
| -rwxr-xr-x | src/media-thumb-internal.c | 14 | ||||
| -rwxr-xr-x | src/util/media-thumb-db.c | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/src/ipc/media-thumb-ipc.c b/src/ipc/media-thumb-ipc.c index 6b63959..5faed91 100755 --- a/src/ipc/media-thumb-ipc.c +++ b/src/ipc/media-thumb-ipc.c @@ -534,8 +534,6 @@ int _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path req_msg.msg_type = msg_type; req_msg.uid = uid; SAFE_STRLCPY(req_msg.org_path, origin_path, sizeof(req_msg.org_path)); - req_msg.org_path[strlen(req_msg.org_path)] = '\0'; - req_msg.origin_path_size = strlen(req_msg.org_path) + 1; req_msg.dest_path_size = strlen(req_msg.dst_path) + 1; req_msg.thumb_size = 0; @@ -586,7 +584,7 @@ int _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path return recv_msg.status; } - strncpy(thumb_path, recv_msg.dst_path, max_length); + SAFE_STRLCPY(thumb_path, recv_msg.dst_path, max_length); return MS_MEDIA_ERR_NONE; } @@ -755,7 +753,6 @@ int _media_thumb_send_request() req_msg.request_id = 0; req_msg.uid = req_manager->uid; SAFE_STRLCPY(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); - req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.dst_path[0] = '\0'; req_msg.origin_path_size = strlen(req_msg.org_path) + 1; req_msg.dest_path_size = 1; @@ -873,7 +870,6 @@ int _media_thumb_raw_data_send_request() req_msg.uid = req_manager->uid; SAFE_STRLCPY(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); - req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.dst_path[0] = '\0'; req_msg.origin_path_size = strlen(req_msg.org_path) + 1; diff --git a/src/media-thumb-internal.c b/src/media-thumb-internal.c index f9e0991..65332c6 100755 --- a/src/media-thumb-internal.c +++ b/src/media-thumb-internal.c @@ -300,7 +300,7 @@ int _media_thumb_get_proper_thumb_size(int orig_w, int orig_h, int *thumb_w, int return MS_MEDIA_ERR_NONE; } -int _media_thumb_get_exif_info(ExifData *ed, char *buf, int max_size, int *value, int ifdtype, long tagtype) +int _media_thumb_get_exif_info(ExifData *ed, int *value, int ifdtype, long tagtype) { ExifEntry *entry; ExifIfd ifd; @@ -327,14 +327,6 @@ int _media_thumb_get_exif_info(ExifData *ed, char *buf, int max_size, int *value ExifByteOrder mByteOrder = exif_data_get_byte_order(ed); short exif_value = exif_get_short(entry->data, mByteOrder); *value = (int)exif_value; - } else { - /* Get the contents of the tag in human-readable form */ - if (buf == NULL) { - thumb_err("buf is NULL"); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } - exif_entry_get_value(entry, buf, max_size); - buf[strlen(buf)] = '\0'; } } @@ -866,7 +858,7 @@ int _media_thumb_jpeg(const char *origin_path, const char *thumb_path, int thumb if (ed) { /* First, Get orientation from exif */ - err = _media_thumb_get_exif_info(ed, NULL, 0, &orientation, EXIF_IFD_0, EXIF_TAG_ORIENTATION); + err = _media_thumb_get_exif_info(ed, &orientation, EXIF_IFD_0, EXIF_TAG_ORIENTATION); if (err != MS_MEDIA_ERR_NONE) { thumb_warn("_media_thumb_get_exif_info failed"); } @@ -905,7 +897,7 @@ int _media_thumb_jpeg(const char *origin_path, const char *thumb_path, int thumb } else { ed = exif_data_new_from_file(origin_path); if (ed) { - err = _media_thumb_get_exif_info(ed, NULL, 0, &orientation, EXIF_IFD_0, EXIF_TAG_ORIENTATION); + err = _media_thumb_get_exif_info(ed, &orientation, EXIF_IFD_0, EXIF_TAG_ORIENTATION); if (err != MS_MEDIA_ERR_NONE) { thumb_warn("_media_thumb_get_exif_info failed"); } diff --git a/src/util/media-thumb-db.c b/src/util/media-thumb-db.c index d955a46..5fdc614 100755 --- a/src/util/media-thumb-db.c +++ b/src/util/media-thumb-db.c @@ -58,7 +58,7 @@ int _media_thumb_get_thumb_from_db(const char *origin_path, char *thumb_path, in } if (sqlite3_step(stmt) == SQLITE_ROW) { - strncpy(thumb_path, (const char *)sqlite3_column_text(stmt, 0), max_length); + SAFE_STRLCPY(thumb_path, (const char *)sqlite3_column_text(stmt, 0), max_length); } else { thumb_err("end of row [%s]", sqlite3_errmsg(db_handle)); SQLITE3_FINALIZE(stmt); |