Updated minor code changes -

  - SAT ITEM_STR_LEN increased to 255
  - OEM cod eclean-up
  - Fixed log parameters in SIM
  - SMS user data check in test source

Change-Id: I94241738d799411bbe5c55b27a308e8e383c1880

diff --git a/include/TelSat.h b/include/TelSat.h
index ce57330..d3dc372 100644 (file)
--- a/include/TelSat.h
+++ b/include/TelSat.h
@@ -52,7 +52,7 @@ extern "C"
  * @brief Definition for the maximum length of a menu item.
  * @since_tizen 2.3
  */
-#define TAPI_SAT_DEF_ITEM_STR_LEN_MAX          50
+#define TAPI_SAT_DEF_ITEM_STR_LEN_MAX          255
 
 /**
  * @brief Definition for the maximum length of a text string.

diff --git a/src/tapi_oem.c b/src/tapi_oem.c
index 8f5c822..c88befa 100644 (file)
--- a/src/tapi_oem.c
+++ b/src/tapi_oem.c
@@ -62,17 +62,15 @@ static void on_response_oem_data_async(GObject *source_object,
        GVariant *dbus_result;
        TelOemData_t oem_data = {0};
        gchar *data = NULL;
-       gsize decoded_data_len = 0;
 
        dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        TAPI_RESP_CHECK_ERROR(error, evt_cb_data);
 
        g_variant_get(dbus_result, "(is)", &oem_data.oem_id, &data);
 
-       oem_data.data = g_base64_decode((const gchar *)data, &decoded_data_len);
+       oem_data.data = g_base64_decode((const gchar *)data, &oem_data.data_len);
        if (oem_data.data) {
                result = TAPI_API_SUCCESS;
-               oem_data.data_len = (unsigned int)decoded_data_len;
 
                dbg("id:[0x%d] len:[%d]", oem_data.oem_id, oem_data.data_len);
 
@@ -140,7 +138,6 @@ EXPORT_API int tel_send_oem_data_sync(TapiHandle *handle, int oem_id,
        gchar *encoded_data = NULL;
        GVariant *rst = NULL;
        gchar *pdata = NULL;
-       gsize decoded_data_len = 0;
 
        dbg("oem_id(0x%x) data(%p) data len(%d)", oem_id, data, data_len);
 
@@ -168,11 +165,9 @@ EXPORT_API int tel_send_oem_data_sync(TapiHandle *handle, int oem_id,
 
        g_variant_get(rst, "(is)", &outparam->oem_id, &pdata);
 
-       outparam->data = g_base64_decode((const gchar *)pdata, &decoded_data_len);
-       if (decoded_data_len) {
-               outparam->data_len = (unsigned int)decoded_data_len;
+       outparam->data = g_base64_decode((const gchar *)pdata, &outparam->data_len);
+       if (outparam->data_len)
                dbg("id:[0x%x] len:[%d]", outparam->oem_id, outparam->data_len);
-       }
 
        g_free(pdata);
        g_variant_unref(rst);

diff --git a/src/tapi_sim.c b/src/tapi_sim.c
index 746a130..2e540cc 100644 (file)
--- a/src/tapi_sim.c
+++ b/src/tapi_sim.c
@@ -139,7 +139,7 @@ static void on_response_get_sim_iccid(GObject *source_object, GAsyncResult *res,
        g_variant_get(dbus_result, "(is)", &result, &iccid);
        iccid_info.icc_length = strlen((const char *)iccid);
        if (iccid_info.icc_length > TAPI_SIM_ICCID_LEN_MAX) {
-               dbg("current tapi support 20 byte but received length[%d] so changed");
+               dbg("current tapi support 20 byte but received length[%d] so changed", iccid_info.icc_length);
                iccid_info.icc_length = TAPI_SIM_ICCID_LEN_MAX;
        }
        memcpy(iccid_info.icc_num, iccid, iccid_info.icc_length);

diff --git a/test_src/sms.c b/test_src/sms.c
index 8b10e70..dfc6a02 100644 (file)
--- a/test_src/sms.c
+++ b/test_src/sms.c
@@ -200,6 +200,10 @@ static BOOL EncodeCdmaSmsParamUserData(char *SendTxt, ParamUserData_t *ParamUser
        }
 
        length = strlen(SendTxt);
+       if (length > MAXLENGTH_SMS_USER_DATA) {
+               printf("[EncodeCdmaSmsParamUserData] Text is too long \n");
+               return ret;
+       }
 
        ParamUser->param_id = SMS_3GPP2_BSUB_ID_USER_DATA;
        ParamUser->encoding = SMS_3GPP2_BSUB_UD_ASCII7BIT_ENCODING;
@@ -240,6 +244,7 @@ static BOOL EncodeCdmaSmsSubmitTpdu(MManager *mm,
        /* Converting Destination number from ASCII to hex*/
        if (__sms_asciistring_to_hex(diallingNum, hex_string, dialNumLen) == FALSE) {
                msg("__sms_asciistring_to_hex() failed.");
+               g_free(encoded_msg);
                return FALSE;
        }
 
@@ -379,7 +384,7 @@ static BOOL EncodeCdmaSmsSubmitTpdu(MManager *mm,
        ret = tel_send_sms(handle, &data_package, 0x0, on_resp_send_cdma_msg, NULL);
        msg("Return Status of CDMA tel_send_sms[%d]", ret);
 
-       free(encoded_msg);
+       g_free(encoded_msg);
        return TRUE;
 }