From: Minje Ahn Date: Fri, 4 Sep 2015 07:17:45 +0000 (+0900) Subject: Fix prevent issue X-Git-Tag: submit/tizen/20150904.072607^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b309816e195b6661013dc54a359c9e97544f0d4;p=platform%2Fcore%2Fapi%2Fthumbnail-util.git Fix prevent issue Change-Id: Ia4c19bf5e5672cd876dfe2340261e74f82874127 Signed-off-by: Minje Ahn --- diff --git a/include/thumbnail_util.h b/include/thumbnail_util.h index 588159c..7b1f0b7 100755 --- a/include/thumbnail_util.h +++ b/include/thumbnail_util.h @@ -57,6 +57,10 @@ int thumbnail_util_create(thumbnail_h *thumb); * * @since_tizen 2.4 * + * @privlevel public + * @privilege %http://tizen.org/privilege/mediastorage \n + * %http://tizen.org/privilege/externalstorage + * * @remarks You must release @a request_id using free(). \n * http://tizen.org/privilege/mediastorage is needed if input or output path are relevant to media storage. \n * http://tizen.org/privilege/externalstorage is needed if input or output path are relevant to external storage. \n @@ -122,6 +126,7 @@ int thumbnail_util_set_size(thumbnail_h thumb, int width, int height); /** * @brief Cancels the thumbnail extraction request for the given media. * @since_tizen 2.4 + * @remarks If there is no item you want to cancel, this API return MEDIA_CONTENT_ERROR_INVALID_OPERATION * * @param[in] thumb The media thumbnail info handle * @param[in] request_id The generated request id by thumbnail extraction request @@ -141,6 +146,7 @@ int thumbnail_util_cancel(thumbnail_h thumb, const char *request_id); /** * @brief Cancels all thumbnail extraction requests associated with the given thumbnail info handle. * @since_tizen 2.4 + * @remarks If there is no item you want to cancel, this API return MEDIA_CONTENT_ERROR_INVALID_OPERATION * * @param[in] thumb The media thumbnail info handle * diff --git a/packaging/capi-media-thumbnail-util.spec b/packaging/capi-media-thumbnail-util.spec index fa76929..fb631a5 100755 --- a/packaging/capi-media-thumbnail-util.spec +++ b/packaging/capi-media-thumbnail-util.spec @@ -1,6 +1,6 @@ Name: capi-media-thumbnail-util Summary: A media thumbnail util library in SLP C API -Version: 0.1.1 +Version: 0.1.2 Release: 1 Group: System/Libraries License: Apache-2.0 @@ -30,6 +30,9 @@ A media thumbnail util library in SLP C API %build +export CFLAGS+=" -Wextra -Wno-array-bounds" +export CFLAGS+=" -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow" +export CFLAGS+=" -Wwrite-strings -Wswitch-default" MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} diff --git a/src/thumbnail_util.c b/src/thumbnail_util.c index 8266e3c..fc16c30 100755 --- a/src/thumbnail_util.c +++ b/src/thumbnail_util.c @@ -25,9 +25,12 @@ void __thumbnail_util_convert_itoa(int request_id, char **req_str) char *buf = NULL; buf = malloc(MAX_SIZE * sizeof(char)); - snprintf(buf, MAX_SIZE, "%d", request_id); - *req_str = strndup(buf, strlen(buf)); - SAFE_FREE(buf); + + if (buf != NULL) { + snprintf(buf, MAX_SIZE, "%d", request_id); + *req_str = strndup(buf, strlen(buf)); + SAFE_FREE(buf); + } } void __thumbnail_util_extract_completed_cb(int error, int request_id, const char *path, int thumb_width, int thumb_height, unsigned char *thumb_data, int thumb_size, void *user_data) { @@ -82,9 +85,12 @@ int thumbnail_util_extract(thumbnail_h thumb, thumbnail_extracted_cb callback, v _thumb->request_id = g_thumbnail_req_id; __thumbnail_util_convert_itoa(_thumb->request_id, request_id); thumbnail_extract_cb_s *_thumb_cb = (thumbnail_extract_cb_s *)calloc(1, sizeof(thumbnail_extract_cb_s)); - _thumb_cb->handle = _thumb; - _thumb_cb->user_data = user_data; - _thumb_cb->thumb_extract_cb = callback; + + if (_thumb_cb != NULL) { + _thumb_cb->handle = _thumb; + _thumb_cb->user_data = user_data; + _thumb_cb->thumb_extract_cb = callback; + } if (_thumb->dst_width == 0 || _thumb->dst_height == 0) { _thumb->dst_width = 320; @@ -154,7 +160,7 @@ int thumbnail_util_cancel_all(thumbnail_h thumb) int ret = THUMBNAIL_UTIL_ERROR_NONE; thumbnail_s *_thumb = (thumbnail_s *)thumb; - if(_thumb != NULL) { + if (_thumb != NULL) { ret = thumbnail_request_cancel_all(true, tzplatform_getuid(TZ_USER_NAME)); } else { thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);