diff options
author | VBS <vdtizen.sds@samsung.com> | 2017-03-29 18:47:31 +0900 |
---|---|---|
committer | jh8801.jung <jh8801.jung@samsung.com> | 2017-03-29 20:05:59 +0900 |
commit | 93185a26f3c47822348bcec9fc6ea3d93e177e72 (patch) | |
tree | 2b4dad0d0de2fa8a58580e498377cb2143c10fef | |
parent | d18f62ff3655deabccc1361475443911f40cdc48 (diff) | |
download | mtp-responder-93185a26f3c47822348bcec9fc6ea3d93e177e72.tar.gz mtp-responder-93185a26f3c47822348bcec9fc6ea3d93e177e72.tar.bz2 mtp-responder-93185a26f3c47822348bcec9fc6ea3d93e177e72.zip |
Sync with 3.0 : Ver. 0.0.19 to 0.0.22
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I2b6a00e7a2ef25f6737adbef94d0b49d51409e6d
-rwxr-xr-x | packaging/mtp-responder.spec | 4 | ||||
-rwxr-xr-x | src/mtp_cmd_handler.c | 18 | ||||
-rwxr-xr-x | src/mtp_cmd_handler_util.c | 6 | ||||
-rwxr-xr-x | src/util/mtp_fs.c | 2 |
4 files changed, 25 insertions, 5 deletions
diff --git a/packaging/mtp-responder.spec b/packaging/mtp-responder.spec index d292281..bf0299d 100755 --- a/packaging/mtp-responder.spec +++ b/packaging/mtp-responder.spec @@ -5,7 +5,7 @@ ExcludeArch: %arm aarch64 Name: mtp-responder Summary: Media Transfer Protocol daemon (responder) -Version: 0.0.19 +Version: 0.0.22 Release: 1 Group: Network & Connectivity/Other License: Apache-2.0 @@ -57,10 +57,10 @@ ln -sf %{_unitdir}/mtp-responder.service %{_sysconfdir}/systemd/default-extra-de %files %manifest mtp-responder.manifest +%license LICENSE.APLv2 %defattr(-,root,root,-) %{_bindir}/mtp-responder %{_unitdir}/mtp-responder.service %{_prefix}/lib/udev/rules.d/99-mtp-responder.rules /opt/var/lib/misc/mtp-responder.conf %{upgrade_script_path}/500.%{name}-upgrade.sh -#%license LICENSE.APLv2 diff --git a/src/mtp_cmd_handler.c b/src/mtp_cmd_handler.c index acaa3e4..4e20d44 100755 --- a/src/mtp_cmd_handler.c +++ b/src/mtp_cmd_handler.c @@ -737,6 +737,7 @@ static void __get_object(mtp_handler_t *hdlr) if (NULL == ptr) { ERR("_hdlr_alloc_buf_data_container() Fail"); _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } @@ -748,9 +749,11 @@ static void __get_object(mtp_handler_t *hdlr) if (EACCES == error) { _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_ACCESSDENIED); + g_free(blk.data); return; } _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } @@ -1252,6 +1255,7 @@ static void __get_device_prop_desc(mtp_handler_t *hdlr) if (ptr == NULL) { resp = PTP_RESPONSE_GEN_ERROR; _cmd_hdlr_send_response_code(hdlr, resp); + g_free(blk.data); return; } @@ -1299,6 +1303,7 @@ static void __get_device_prop_value(mtp_handler_t *hdlr) if (ptr == NULL) { _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } memcpy(ptr, &batt, no_bytes); @@ -1329,6 +1334,7 @@ static void __get_device_prop_value(mtp_handler_t *hdlr) if (ptr == NULL) { _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } @@ -1361,6 +1367,7 @@ static void __get_device_prop_value(mtp_handler_t *hdlr) if (ptr == NULL) { _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } @@ -1429,6 +1436,7 @@ static void __get_device_prop_value(mtp_handler_t *hdlr) if (ptr == NULL) { _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); g_free(data); _util_file_close(h_file); _prop_deinit_ptparray(&val_arr); @@ -1487,6 +1495,7 @@ static void __set_device_prop_value(mtp_handler_t *hdlr) if (FALSE == _hdlr_rcv_data_container(&blk, max_bytes)) { ERR("_hdlr_rcv_data_container() Fail"); _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } @@ -1724,8 +1733,10 @@ static void __set_object_references(mtp_handler_t *hdlr) } ptr = _hdlr_get_payload_data(&blk); - if (ptr == NULL) + if (ptr == NULL) { + g_free(blk.data); return; + } memcpy(&num_ref, ptr, sizeof(mtp_uint32)); #ifdef __BIG_ENDIAN__ @@ -2682,6 +2693,7 @@ static void __get_interdep_prop_desc(mtp_handler_t *hdlr) num_bytes, fmt)) { ERR("_hutil_get_interdep_prop_config_list_data() Fail"); _cmd_hdlr_send_response_code(hdlr, PTP_RESPONSE_GEN_ERROR); + g_free(blk.data); return; } @@ -2791,8 +2803,10 @@ static void __send_object_prop_list(mtp_handler_t *hdlr) } data = _hdlr_get_payload_data(&blk); - if (data == NULL) + if (data == NULL) { + g_free(blk.data); return; + } ret = _hutil_construct_object_entry_prop_list(store_id, h_parent, fmt, f_size, ((hdlr->data4_send_obj.is_valid == TRUE) ? diff --git a/src/mtp_cmd_handler_util.c b/src/mtp_cmd_handler_util.c index 2e265af..8f821dd 100755 --- a/src/mtp_cmd_handler_util.c +++ b/src/mtp_cmd_handler_util.c @@ -1893,12 +1893,18 @@ mtp_err_t _hutil_construct_object_entry_prop_list(mtp_uint32 store_id, g_free(alb_buf); #endif /* MTP_SUPPORT_ALBUM_ART */ *obj_ptr = obj; + if (obj_info != NULL) + _entity_dealloc_obj_info(obj_info); + return MTP_ERROR_NONE; ERROR_EXIT: #ifdef MTP_SUPPORT_ALBUM_ART g_free(alb_buf); #endif /* MTP_SUPPORT_ALBUM_ART */ + if (obj_info != NULL) + _entity_dealloc_obj_info(obj_info); + return resp; } diff --git a/src/util/mtp_fs.c b/src/util/mtp_fs.c index b206f9b..4085c0e 100755 --- a/src/util/mtp_fs.c +++ b/src/util/mtp_fs.c @@ -923,7 +923,7 @@ void _util_fill_guid_array(void *guidarray, mtp_uint32 start_index, */ void FLOGD(const char *fmt, ...) { - static int written_bytes = 0; + static mtp_int64 written_bytes = 0; FILE *fp = NULL; va_list ap; |