diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2016-01-05 17:38:09 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-01-05 17:38:09 +0900 |
commit | 7c6a97e7124aeccdf0b47fd4e7d232f1d8e0ef6f (patch) | |
tree | c8589e2e07a2f340fda0f639b6bb262488701cee | |
parent | 6b372654c9af1ad899e2aab79ecf7ce57ae75a85 (diff) | |
download | camera-7c6a97e7124aeccdf0b47fd4e7d232f1d8e0ef6f.tar.gz camera-7c6a97e7124aeccdf0b47fd4e7d232f1d8e0ef6f.tar.bz2 camera-7c6a97e7124aeccdf0b47fd4e7d232f1d8e0ef6f.zip |
[Release version 0.2.33] Fix crash - too small allocation for message parsing from serversubmit/tizen/20160105.093305submit/tizen/20160105.085903accepted/tizen/wearable/20160106.003436accepted/tizen/tv/20160106.003402accepted/tizen/mobile/20160106.003506
Change-Id: I955ea9f5ee600760330cfe968c9dbb572d2c2d3c
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | include/camera_private.h | 2 | ||||
-rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
-rw-r--r-- | src/camera.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/camera_private.h b/include/camera_private.h index ecaf45b..95865a5 100644 --- a/include/camera_private.h +++ b/include/camera_private.h @@ -30,7 +30,7 @@ extern "C" { #endif -#define CAMERA_PARSE_STRING_SIZE 10 +#define CAMERA_PARSE_STRING_SIZE 20 typedef struct _camera_cb_info_s { gint fd; diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 73da928..790cdbc 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -3,7 +3,7 @@ Name: capi-media-camera Summary: A Camera API -Version: 0.2.32 +Version: 0.2.33 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index 2b60665..64cdebe 100644 --- a/src/camera.c +++ b/src/camera.c @@ -42,7 +42,7 @@ #ifdef LOG_TAG #undef LOG_TAG #endif -#define LOG_TAG "TIZEN_N_CAMERA_CLIENT" +#define LOG_TAG "TIZEN_N_CAMERA" int __convert_camera_error_code(const char *func, int code) @@ -2345,9 +2345,9 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ goto _SET_DISPLAY_ERROR; } - LOGD("shmsrc socket path : %s", socket_path); + LOGD("socket path : %s", socket_path); - ret = mm_camcorder_client_set_shm_socket_path(pc->client_handle, socket_path); + ret = mm_camcorder_client_set_socket_path(pc->client_handle, socket_path); if (ret != MM_ERROR_NONE) { LOGE("failed to set socket path 0x%x", ret); goto _SET_DISPLAY_ERROR; |