From 0211d8ec6f68931f01eaa65ec4f2989f3efdf3cd Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 17 Mar 2021 18:14:43 +0900 Subject: [PATCH] snprintf(): use sizeof() for size factor Change-Id: I9a94e6c82b1bd40f06d66e8e2bec13a860ce5f20 --- packaging/download-provider.spec | 2 +- provider/download-provider-security.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec index 36d2283..95639d0 100755 --- a/packaging/download-provider.spec +++ b/packaging/download-provider.spec @@ -1,6 +1,6 @@ Name: download-provider Summary: Download the contents in background -Version: 2.2.3 +Version: 2.2.4 Release: 0 Group: Development/Libraries License: Apache-2.0 diff --git a/provider/download-provider-security.c b/provider/download-provider-security.c index 332080a..0b72bec 100644 --- a/provider/download-provider-security.c +++ b/provider/download-provider-security.c @@ -146,7 +146,7 @@ int dp_is_valid_dir(dp_credential cred, const char *dirpath) return DP_ERROR_INVALID_DESTINATION; } - strncpy(resolved_path, res, PATH_MAX - 1); + strncpy(resolved_path, res, sizeof(resolved_path) - 1); free(res); end = strlen(resolved_path) - 1; @@ -170,7 +170,7 @@ int dp_is_valid_dir(dp_credential cred, const char *dirpath) // Check whether directory is default directory or not. temp = tzplatform_getenv(TZ_USER_DOWNLOADS); if (temp) { - snprintf(default_storage, PATH_MAX - 1, "%s/", temp); + snprintf(default_storage, sizeof(default_storage) - 1, "%s/", temp); if (strncmp(resolved_path, default_storage, strlen(default_storage)) == 0) return DP_ERROR_NONE; @@ -180,7 +180,7 @@ int dp_is_valid_dir(dp_credential cred, const char *dirpath) // Check permission: media storage temp = tzplatform_getenv(TZ_USER_CONTENT); if (temp) { - snprintf(media_storage, PATH_MAX - 1, "%s/", temp); + snprintf(media_storage, sizeof(media_storage) - 1, "%s/", temp); if (strncmp(resolved_path, media_storage, strlen(media_storage)) == 0) { if (_dp_check_dir_permission(cred, MEDIA_STORAGE_PRIVILEGE) < 0) { @@ -196,7 +196,7 @@ int dp_is_valid_dir(dp_credential cred, const char *dirpath) // Check permission: external storage temp = tzplatform_getenv(TZ_SYS_STORAGE); if (temp) { - snprintf(external_storage, PATH_MAX - 1, "%s/", temp); + snprintf(external_storage, sizeof(external_storage) - 1, "%s/", temp); if (strncmp(resolved_path, external_storage, strlen(external_storage)) == 0) { if (_dp_check_dir_permission(cred, EXTERNAL_STORAGE_PRIVILEGE) < 0) { @@ -212,10 +212,10 @@ int dp_is_valid_dir(dp_credential cred, const char *dirpath) // Check permission: private storage if (strncmp(resolved_path, LEGACY_USER_APP, strlen(LEGACY_USER_APP)) == 0) { // Some applications use a legacy app path. - snprintf(apps_storage, PATH_MAX - 1, "%s", LEGACY_USER_APP); + snprintf(apps_storage, sizeof(apps_storage) - 1, "%s", LEGACY_USER_APP); } else { temp = tzplatform_getenv(TZ_USER_APP); - snprintf(apps_storage, PATH_MAX - 1, "%s/", temp); + snprintf(apps_storage, sizeof(apps_storage) - 1, "%s/", temp); temp = NULL; } -- 2.7.4