diff options
author | hj kim <backto.kim@samsung.com> | 2020-03-13 06:37:21 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2020-03-13 06:37:21 +0000 |
commit | 10a09fbddebb32c1adf47f6e433a85040b30f658 (patch) | |
tree | 81c75fe24443e5d18e246f570a0f51db62f6f336 | |
parent | c7251f9165341acc17a5fc30046c256b281b061f (diff) | |
parent | 84c5febb83c52dd7f7286df44a51a78b18ffe00e (diff) | |
download | libmedia-service-10a09fbddebb32c1adf47f6e433a85040b30f658.tar.gz libmedia-service-10a09fbddebb32c1adf47f6e433a85040b30f658.tar.bz2 libmedia-service-10a09fbddebb32c1adf47f6e433a85040b30f658.zip |
Merge "check src before doing g_strlcpy and g_strlcat" into tizensubmit/tizen/20200313.040349submit/tizen/20200313.001656accepted/tizen/unified/20200315.214848
-rwxr-xr-x | src/include/common/media-svc-util.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h index 28e0580..7129bbf 100755 --- a/src/include/common/media-svc-util.h +++ b/src/include/common/media-svc-util.h @@ -34,12 +34,25 @@ extern "C" { #endif -#define SAFE_FREE(src) { if (src) {free(src); src = NULL; } } -#define STRING_VALID(str) \ - ((str != NULL && strlen(str) > 0) ? true : false) +#define STRING_VALID(str) (str != NULL && strlen(str) > 0) -#define SAFE_STRLCAT(dst, src, n) g_strlcat(dst, src, n); -#define SAFE_STRLCPY(dst, src, n) g_strlcpy(dst, src, n); +#define SAFE_FREE(src) do { \ + if (src) { \ + free(src); \ + src = NULL; \ + } \ + } while (0) + + +#define SAFE_STRLCAT(dst, src, n) do { \ + if (src) \ + g_strlcat(dst, src, n); \ + } while (0) + +#define SAFE_STRLCPY(dst, src, n) do { \ + if (src) \ + g_strlcpy(dst, src, n); \ + } while (0) /** * Media meta data information |