Add null check in main.cpp

Change-Id: I51e178d9f3483c6447db7ed68aaa2d34b884ca05

diff --git a/src/main.cpp b/src/main.cpp
index 5dde3ab..f4354d2 100755 (executable)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -82,13 +82,17 @@ void initialize_datacontrol_provider()
        int result;
 
        sql_callback = (data_control_provider_sql_cb *)malloc(sizeof(data_control_provider_sql_cb));
-       sql_callback->select_cb = select_request_cb;
-       sql_callback->insert_cb = insert_request_cb;
-       sql_callback->delete_cb = delete_request_cb;
-       sql_callback->update_cb = update_request_cb;
-       result = data_control_provider_sql_register_cb(sql_callback, NULL);
+       if (sql_callback) {
+               sql_callback->select_cb = select_request_cb;
+               sql_callback->insert_cb = insert_request_cb;
+               sql_callback->delete_cb = delete_request_cb;
+               sql_callback->update_cb = update_request_cb;
+               result = data_control_provider_sql_register_cb(sql_callback, NULL);
+       } else {
+               result = DATA_CONTROL_ERROR_OUT_OF_MEMORY;
+       }
        if (result != DATA_CONTROL_ERROR_NONE)
-               DM_LOGE("data_control_sql_response_c failed with error: %d", result);
+               DM_LOGE("initialize_datacontrol_provider failed with error: %d", result);
        else
                DM_LOGI("Provider SQL register success");
 }
@@ -106,7 +110,7 @@ static void __lang_changed_cb(app_event_info_h event_info, void *data)
        return;
 }
 
-static void __region_changed_cb(app_event_info_h event_info,void *data)
+static void __region_changed_cb(app_event_info_h event_info, void *data)
 {
        DownloadView &view = DownloadView::getInstance();
        view.changedRegion();
@@ -250,7 +254,7 @@ static void __app_control(app_control_h s, void *data)
        if (app_control_get_uri(s, &url) < 0) {
                DM_LOGE("Invalid URL");
        } else {
-               DM_SLOGI("url[%s]",url);
+               DM_SLOGI("url[%s]", url);
                if (url)
                        reqUrl = url;
                free(url);
@@ -260,13 +264,13 @@ static void __app_control(app_control_h s, void *data)
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (default_storage) {
                        string defaultStorage = string(default_storage);
-                       if (defaultStorage.compare("1") == 0)
+                       if (defaultStorage.compare("1") == 0) {
                                reqInstallDir.assign(DM_DEFAULT_MMC_INSTALL_DIR);
-                       else{
+                       } else {
                                reqInstallDir.assign(DM_DEFAULT_PHONE_INSTALL_DIR);
                                reqInstallDir.append("/");
                        }
-                       DM_SLOGI("install dir[%s]",reqInstallDir.c_str());
+                       DM_SLOGI("install dir[%s]", reqInstallDir.c_str());
                }
                free(default_storage);
        } else {
@@ -277,7 +281,7 @@ static void __app_control(app_control_h s, void *data)
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (file_name) {
                        reqFileName.assign(file_name);
-                       DM_SLOGI("User preferred file name[%s]",reqFileName.c_str());
+                       DM_SLOGI("User preferred file name[%s]", reqFileName.c_str());
                }
                free(file_name);
        } else {
@@ -286,13 +290,13 @@ static void __app_control(app_control_h s, void *data)
 
        ret = app_control_get_extra_data(s, KEY_REQ_HTTP_HEADER_FIELD, &req_header_field);
        if (ret == APP_CONTROL_ERROR_NONE) {
-               DM_SLOGI("request header filed[%s]",req_header_field);
+               DM_SLOGI("request header filed[%s]", req_header_field);
                if (req_header_field)
                        reqHeaderField = req_header_field;
                free(req_header_field);
                ret = app_control_get_extra_data(s, KEY_REQ_HTTP_HEADER_VALUE, &req_header_value);
                if (ret == APP_CONTROL_ERROR_NONE) {
-                       DM_SLOGI("request header value[%s]",req_header_value);
+                       DM_SLOGI("request header value[%s]", req_header_value);
                        if (req_header_value)
                                reqHeaderValue = req_header_value;
                        free(req_header_value);
@@ -301,7 +305,7 @@ static void __app_control(app_control_h s, void *data)
 
        ret = app_control_get_extra_data(s, KEY_MODE, &mode);
        if (ret == APP_CONTROL_ERROR_NONE) {
-               DM_SLOGI("mode[%s]",mode);
+               DM_SLOGI("mode[%s]", mode);
                if (0 == strncmp(mode, KEY_MODE_VALUE_VIEW,
                                strlen(KEY_MODE_VALUE_VIEW))) {
                        DM_LOGI("View mode");
@@ -371,7 +375,7 @@ static void __app_control(app_control_h s, void *data)
                        string tmpStr = string(network_bonding);
                        if (tmpStr.compare("true") == 0)
                                reqNetworkBonding = true;
-                       DM_LOGI("network_bonding option[%s]",tmpStr.c_str());
+                       DM_LOGI("network_bonding option[%s]", tmpStr.c_str());
                }
                free(network_bonding);
        } else {
@@ -393,7 +397,7 @@ static void __app_control(app_control_h s, void *data)
 
 EXPORT_API int main(int argc, char *argv[])
 {
-       ui_app_lifecycle_callback_s evt_cb = {0,};
+       ui_app_lifecycle_callback_s evt_cb = {0, };
 
        int ret = 0;
        struct app_data_t *app_data = NULL;