From 1e82260ebff6f4cb53949a9a76b4caa4561a00a0 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 18 Aug 2021 17:46:55 +0900 Subject: [PATCH] Add "\r" to delimiters for ini parsing - The carriage return("\r") could be included in ini file and it causes unexpected parsing error. [Version] 0.10.243 [Issue Type] Improvement Change-Id: Ib6f8c157ec79f4ef1fdab520665fa8598e92a99b Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_configure.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index f359b9d..dc764dc 100755 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.242 +Version: 0.10.243 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c index 1dbc9f3..ab14db8 100644 --- a/src/mm_camcorder_configure.c +++ b/src/mm_camcorder_configure.c @@ -990,7 +990,7 @@ int _mmcamcorder_conf_parse_info(MMHandleType handle, int type, FILE *fp, camera const unsigned int BUFFER_NUM_DETAILS = 256; const unsigned int BUFFER_NUM_TOKEN = 20; size_t buffer_line_size = MMCAMCORDER_BUFFER_LINE_MAX; - const char* delimiters = " |=,\t\n"; + const char* delimiters = " |=,\t\r\n"; int i = 0; int ret = MM_ERROR_NONE; @@ -1360,9 +1360,9 @@ int _mmcamcorder_conf_add_info(MMHandleType handle, int type, conf_detail **info char *buffer_token[BUFFER_NUM_TOKEN]; char *user_ptr = NULL; - const char *delimiters = " |=,\t\n"; - const char *delimiters_sub = " |\t\n"; - const char *delimiters_3rd = "|\n"; + const char *delimiters = " |=,\t\r\n"; + const char *delimiters_sub = " |\t\r\n"; + const char *delimiters_3rd = "|\r\n"; mmf_return_val_if_fail(info && buffer_details, FALSE); @@ -1371,7 +1371,7 @@ int _mmcamcorder_conf_add_info(MMHandleType handle, int type, conf_detail **info (*info)->count = count_details; for (i = 0 ; i < count_details ; i++) { - MMCAM_LOG_VERBOSE("Read line\"%s\"", buffer_details[i]); + MMCAM_LOG_VERBOSE("Read line \"%s\"", buffer_details[i]); count_token = 0; token = strtok_r(buffer_details[i], delimiters, &user_ptr); -- 2.7.4