[CTC][Non-ACR][SVACE fixes for modules]

Change-Id: I2425f421b420475b0aaef0db76f9798ae0c5383e
Signed-off-by: Shilpa Jindal <shilpa.j@samsung.com>

diff --git a/src/ctc/image-util/CTs-image-util-common.h b/src/ctc/image-util/CTs-image-util-common.h
index 3059e00..9769783 100755 (executable)
--- a/src/ctc/image-util/CTs-image-util-common.h
+++ b/src/ctc/image-util/CTs-image-util-common.h
@@ -27,7 +27,7 @@
 */
 
 #define API_NAMESPACE                          "IMAGE_UTIL_CTC"
-#define SAMPLE_FILE_PATH                       (ImageUtilGetDataPath("/ImageUtil_sample.jpg"))
+#define SAMPLE_FILE                            "ImageUtil_sample.jpg"
 #define OUTPUT_FILE_PATH                       (ImageUtilGetDataPath("output.jpg"))
 #define MEMLOG                                                 20
 #define MAX_BLOCK_SIZE                 25

diff --git a/src/ctc/image-util/CTs-image-util.c b/src/ctc/image-util/CTs-image-util.c
index b3afa12..b34aec6 100755 (executable)
--- a/src/ctc/image-util/CTs-image-util.c
+++ b/src/ctc/image-util/CTs-image-util.c
@@ -87,17 +87,25 @@ int CTc_ImageUtil_ImageEncoder_JPEG_p(void)
        int nWidth = 0, nHeight = 0;
        unsigned int unDecodeSize = 0;
        unsigned char * upszImgSourceBuffer = NULL;
+       char * pszImgPath = ImageUtilGetDataPath(SAMPLE_FILE);
+       if(pszImgPath == NULL)
+       {
+               FPRINTF("[Line : %d][%s] ImageUtilGetDataPath failed\\n", __LINE__, API_NAMESPACE);
+               return 1;
+       }
 
-       int nRet = image_util_decode_jpeg (SAMPLE_FILE_PATH, IMAGE_UTIL_COLORSPACE_RGB888, &upszImgSourceBuffer, &nWidth, &nHeight, &unDecodeSize);
-       PRINT_RESULT(IMAGE_UTIL_ERROR_NONE, nRet, "image_util_decode_jpeg", ImageUtilGetError(nRet));
+       int nRet = image_util_decode_jpeg (pszImgPath, IMAGE_UTIL_COLORSPACE_RGB888, &upszImgSourceBuffer, &nWidth, &nHeight, &unDecodeSize);
+       PRINT_RESULT_CLEANUP(IMAGE_UTIL_ERROR_NONE, nRet, "image_util_decode_jpeg", ImageUtilGetError(nRet),FREE_MEMORY(pszImgPath));
        
        if ( ImageUtilCheckFunction(upszImgSourceBuffer, nWidth, nHeight, unDecodeSize) == false )
        {
                FREE_MEMORY(upszImgSourceBuffer);
+               FREE_MEMORY(pszImgPath);
                return 1;
        }
 
        FREE_MEMORY(upszImgSourceBuffer);
+       FREE_MEMORY(pszImgPath);
 
        if ( ImageUtilEncode(nWidth, nHeight, IMAGE_UTIL_COLORSPACE_RGB888) == false )
        {
@@ -132,19 +140,26 @@ int CTc_ImageUtil_ImageDecoder_JPG_p(void)
        int nWidth = 0, nHeight = 0;
        unsigned int unDecodeSize = 0;
        unsigned char * upszImgSourceBuffer = NULL;
-
-       int nRet = image_util_decode_jpeg (SAMPLE_FILE_PATH, IMAGE_UTIL_COLORSPACE_RGB888, &upszImgSourceBuffer, &nWidth, &nHeight, &unDecodeSize);
-       PRINT_RESULT(IMAGE_UTIL_ERROR_NONE, nRet, "image_util_decode_jpeg", ImageUtilGetError(nRet));
+       char * pszImgPath = ImageUtilGetDataPath(SAMPLE_FILE);
+       if(pszImgPath == NULL)
+       {
+               FPRINTF("[Line : %d][%s] ImageUtilGetDataPath failed\\n", __LINE__, API_NAMESPACE);
+               return 1;
+       }
+       int nRet = image_util_decode_jpeg (pszImgPath, IMAGE_UTIL_COLORSPACE_RGB888, &upszImgSourceBuffer, &nWidth, &nHeight, &unDecodeSize);
+       PRINT_RESULT_CLEANUP(IMAGE_UTIL_ERROR_NONE, nRet, "image_util_decode_jpeg", ImageUtilGetError(nRet),FREE_MEMORY(pszImgPath));
 
        if ( ImageUtilCheckFunction(upszImgSourceBuffer, nWidth, nHeight, unDecodeSize) == false )
        {
                FREE_MEMORY(upszImgSourceBuffer);
+               FREE_MEMORY(pszImgPath);
                return 1;
        }
 
        if ( ImageUtilEncode(nWidth, nHeight, IMAGE_UTIL_COLORSPACE_RGB888) == false )
        {
                FREE_MEMORY(upszImgSourceBuffer);
+               FREE_MEMORY(pszImgPath);
                return 1;
        }
 
@@ -153,16 +168,19 @@ int CTc_ImageUtil_ImageDecoder_JPG_p(void)
        {
                FPRINTF("[Line : %d][%s] image_util_decode_jpeg failed, error returned = %s\\n", __LINE__, API_NAMESPACE, ImageUtilGetError(nRet));
                FREE_MEMORY(upszImgSourceBuffer);
+               FREE_MEMORY(pszImgPath);
                return 1;
        }
 
        if ( ImageUtilCheckFunction(upszImgSourceBuffer, nWidth, nHeight, unDecodeSize) == false )
        {
                FREE_MEMORY(upszImgSourceBuffer);
+               FREE_MEMORY(pszImgPath);
                return 1;
        }
 
        FREE_MEMORY(upszImgSourceBuffer);
+       FREE_MEMORY(pszImgPath);
        return 0;
 }
 

diff --git a/src/ctc/platform-permission/CTs-platform-permission-common.h b/src/ctc/platform-permission/CTs-platform-permission-common.h
index 5bedbce..aa271e7 100755 (executable)
--- a/src/ctc/platform-permission/CTs-platform-permission-common.h
+++ b/src/ctc/platform-permission/CTs-platform-permission-common.h
@@ -181,10 +181,7 @@
 else \
 {\
        FPRINTF("[Line : %d][%s] %s failed, error returned = %s [%d]\\n", __LINE__, API_NAMESPACE, API, Error, eRetVal);\
-       if ( eRetVal == ERROR_NONE )\
-       {\
-               FreeResource;\
-       }\
+       FreeResource;\
        return 1;\
 }\
 }

diff --git a/src/ctc/platform-permission/CTs-platform-permission-recorder.c b/src/ctc/platform-permission/CTs-platform-permission-recorder.c
index b61005f..7db0b1d 100755 (executable)
--- a/src/ctc/platform-permission/CTs-platform-permission-recorder.c
+++ b/src/ctc/platform-permission/CTs-platform-permission-recorder.c
@@ -181,8 +181,8 @@ void GetFileName(void)
 
        g_RecorderFile = (char *)malloc(strlen(pszPath) + strlen(FILENAME) + 1);
        memset(g_RecorderFile, 0x00, (strlen(pszPath) + strlen(FILENAME) + 1));
-       strcpy(g_RecorderFile, pszPath);
-       strcat(g_RecorderFile, FILENAME);
+       strncpy(g_RecorderFile, pszPath,strlen(g_RecorderFile)+1);
+       strncat(g_RecorderFile, FILENAME,strlen(FILENAME)+1);
        FPRINTF("[Line: %d][%s] Output File Path is %s\\n", __LINE__,API_NAMESPACE, g_RecorderFile);
 }
 
@@ -239,6 +239,7 @@ bool ReadyRecorderHandler(void)
        if ( nRet != RECORDER_ERROR_NONE )
        {
                FPRINTF("[Line: %d][%s] recorder_set_filename failed, error returned = %s\\n", __LINE__,API_NAMESPACE, RecorderGetError(nRet));
+               FREE_MEMORY(pchSetFilename);
                return false;
        }
 
@@ -246,6 +247,7 @@ bool ReadyRecorderHandler(void)
        if ( nRet != RECORDER_ERROR_NONE )
        {
                FPRINTF("[Line: %d][%s] recorder_set_file_format failed, error returned = %s\\n", __LINE__, API_NAMESPACE,RecorderGetError(nRet));
+               FREE_MEMORY(pchSetFilename);
                return false;
        }
 
@@ -253,6 +255,7 @@ bool ReadyRecorderHandler(void)
        if ( nRet != RECORDER_ERROR_NONE )
        {
                FPRINTF("[Line: %d][%s] recorder_prepare failed, error returned = %s\\n", __LINE__,API_NAMESPACE, RecorderGetError(nRet));
+               FREE_MEMORY(pchSetFilename);
                return false;
        }
 

diff --git a/src/ctc/platform-permission/CTs-platform-permission-service-adaptor-client.c b/src/ctc/platform-permission/CTs-platform-permission-service-adaptor-client.c
index 19fb16e..9d9e420 100755 (executable)
--- a/src/ctc/platform-permission/CTs-platform-permission-service-adaptor-client.c
+++ b/src/ctc/platform-permission/CTs-platform-permission-service-adaptor-client.c
@@ -357,11 +357,11 @@ void sync_context_destroy(sync_context_h sync_context)
 */
 bool RemoveFile(void)
 {
-       struct stat buf;
+       /*struct stat buf;
        if ( stat(g_pszDOWNLOAD_PATH, &buf) == 0 )
        {
                remove(g_pszDOWNLOAD_PATH);
-       }
+       }*/
 
        sync_context_h sync_context = sync_context_create();
 /*
@@ -400,11 +400,11 @@ bool UploadFile(void)
        
        sync_context_h sync_context = sync_context_create();
        nRet = service_storage_set_task_state_changed_cb(hTask, TaskStateCallback, (void *)sync_context);
-       PRINT_RESULT_CLEANUP(SERVICE_ADAPTOR_ERROR_NONE, nRet, "service_storage_set_task_state_changed_cb", ServiceAdaptorGetError(nRet), service_storage_destroy_task(hTask));
+       PRINT_RESULT_CLEANUP(SERVICE_ADAPTOR_ERROR_NONE, nRet, "service_storage_set_task_state_changed_cb", ServiceAdaptorGetError(nRet),sync_context_destroy(sync_context); service_storage_destroy_task(hTask));
 
        g_bCallbackHit = false;
        nRet = service_storage_start_task(hTask);
-       PRINT_RESULT_CLEANUP(SERVICE_ADAPTOR_ERROR_NONE, nRet, "service_storage_start_task", ServiceAdaptorGetError(nRet), service_storage_destroy_task(hTask));
+       PRINT_RESULT_CLEANUP(SERVICE_ADAPTOR_ERROR_NONE, nRet, "service_storage_start_task", ServiceAdaptorGetError(nRet), sync_context_destroy(sync_context);service_storage_destroy_task(hTask));
 
        //      WaitForAsync();
        sync_context_wait_for_callback(sync_context);

diff --git a/src/ctc/platform-permission/CTs-platform-permission-telephony.c b/src/ctc/platform-permission/CTs-platform-permission-telephony.c
index 7a2b99c..6dda335 100755 (executable)
--- a/src/ctc/platform-permission/CTs-platform-permission-telephony.c
+++ b/src/ctc/platform-permission/CTs-platform-permission-telephony.c
@@ -23,14 +23,13 @@ char *TelephonyGetSimState(telephony_sim_state_e eRet);
 */
 char *TelephonyGetSimState(telephony_sim_state_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown State";
        switch ( eRet )
        {
        case TELEPHONY_SIM_STATE_UNAVAILABLE:           szErrorVal = "TELEPHONY_SIM_STATE_UNAVAILABLE";         break;
        case TELEPHONY_SIM_STATE_LOCKED:                szErrorVal = "TELEPHONY_SIM_STATE_LOCKED";              break;
        case TELEPHONY_SIM_STATE_AVAILABLE:             szErrorVal = "TELEPHONY_SIM_STATE_AVAILABLE";           break;
        case TELEPHONY_SIM_STATE_UNKNOWN:               szErrorVal = "TELEPHONY_SIM_STATE_UNKNOWN";             break;
-       default:                                        szErrorVal = "Unknown State";                           break;
        }
        return szErrorVal;
 }

diff --git a/src/ctc/player/CTs-player-common.c b/src/ctc/player/CTs-player-common.c
index 222ff23..9270f93 100755 (executable)
--- a/src/ctc/player/CTs-player-common.c
+++ b/src/ctc/player/CTs-player-common.c
@@ -59,7 +59,7 @@ char* PlayerGetError(int nResult)
 */
 char* PlayerGetState(player_state_e eState)
 {
-       char* pszState = NULL;
+       char* pszState = "Unknown State";
        switch ( eState )
        {
        case PLAYER_STATE_NONE:                 pszState = "PLAYER_STATE_NONE";                 break;
@@ -67,7 +67,6 @@ char* PlayerGetState(player_state_e eState)
        case PLAYER_STATE_READY:                pszState = "PLAYER_STATE_READY";                break;
        case PLAYER_STATE_PLAYING:              pszState = "PLAYER_STATE_PLAYING";              break;
        case PLAYER_STATE_PAUSED:               pszState = "PLAYER_STATE_PAUSED";               break;
-       default:                                                pszState = "Unknown State";
        }
 
        return pszState;
@@ -117,7 +116,9 @@ bool PlayerInitialization(bool bPrepare, MediaTypeEnumeration eMediaType)
 
        if ( eMediaType == MeidaType_Audio )
        {
-               nRet = player_set_uri(g_PlayerHandler, MEDIA_PATH_AUDIO);
+               char *pszAudioPath = MediaPlayerGetDataPath(MEDIA_AUDIO);
+               
+               nRet = player_set_uri(g_PlayerHandler, pszAudioPath);
                #if defined(WEARABLE)
            bool bValue = false;
                system_info_get_platform_bool(INTERNET_FEATURE, &bValue);
@@ -126,10 +127,12 @@ bool PlayerInitialization(bool bPrepare, MediaTypeEnumeration eMediaType)
                        if(nRet != PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE)
                        {
                                FPRINTF("[Line : %d][%s] player_set_uri API call returned mismatch %s error for unsupported internet feature\\n", __LINE__, API_NAMESPACE,  PlayerGetError(nRet));
+                               FREE_MEMORY(pszAudioPath);
                                return false;
                        }
                }
                #endif
+               FREE_MEMORY(pszAudioPath);
        }
 
        if ( nRet != PLAYER_ERROR_NONE )

diff --git a/src/ctc/player/CTs-player-common.h b/src/ctc/player/CTs-player-common.h
index d3ea0bd..f0c3709 100755 (executable)
--- a/src/ctc/player/CTs-player-common.h
+++ b/src/ctc/player/CTs-player-common.h
@@ -43,7 +43,7 @@
 #define WAIT_TIME                                                      5
 #define MAX_SPEAKER_VOLUME_CONTROL                     5
 #define MAX_EARPHONE_VOLUME_CONTROL                    5
-#define MEDIA_PATH_AUDIO                                       (MediaPlayerGetDataPath("MediaPlayer.mp3"))
+#define MEDIA_AUDIO                                                    "MediaPlayer.mp3"
 #define INTERNET_FEATURE                                       "http://tizen.org/feature/network.internet"
 
 #define START_TEST {\

diff --git a/src/ctc/video-util/CTs-video-util-common.c b/src/ctc/video-util/CTs-video-util-common.c
index 7c12e58..2c044e8 100755 (executable)
--- a/src/ctc/video-util/CTs-video-util-common.c
+++ b/src/ctc/video-util/CTs-video-util-common.c
@@ -46,7 +46,7 @@ bool VideoUtilGetDataPath(char* pAppDataPath)
                return false;
        }
 
-       strcpy(pAppDataPath, pPath);
+       strncpy(pAppDataPath, pPath,strlen(pPath)+1);
        return true;
 }
 
@@ -71,8 +71,9 @@ bool VideoUtilAppendToAppDataPath(char* pInputPath, char* pFinalPath)
        }
 
        memset(pFinalPath, 0, MAX_BLOCK_SIZE);
-       strcpy(pFinalPath, pAppDataPath);
-       strcat(pFinalPath, pInputPath);
+       strncpy(pFinalPath, pAppDataPath,strlen(pAppDataPath)+1);
+       strncat(pFinalPath, pInputPath,strlen(pInputPath)+1);
+
 #if DEBUG
        FPRINTF("[Line : %d][%s] result path returned = %s\\n", __LINE__, API_NAMESPACE, pFinalPath);
 #endif

diff --git a/src/ctc/vulkan/CTs-vulkan-draw.c b/src/ctc/vulkan/CTs-vulkan-draw.c
index 38026e3..cbcbd16 100755 (executable)
--- a/src/ctc/vulkan/CTs-vulkan-draw.c
+++ b/src/ctc/vulkan/CTs-vulkan-draw.c
@@ -1303,7 +1303,10 @@ char *demo_read_spv(const char *filename, size_t *psize) {
     shader_code = malloc(size);
     retVal = fread(shader_code, size, 1, fp);
     if (!retVal)
+       {
+               fclose(fp);
         return NULL;
+       }
 
     *psize = size;