Fix the Svace issue 48/178948/2
authorcookie <cookie@samsung.com>
Tue, 15 May 2018 04:37:46 +0000 (13:37 +0900)
committercookie <cookie@samsung.com>
Tue, 15 May 2018 04:45:15 +0000 (13:45 +0900)
Change-Id: I56de401e6546415dd99fcfdf92ec95ab2fb79143
Signed-off-by: cookie <cookie@samsung.com>
.gbs.conf
bookmark-adaptor/bookmark-adaptor-image.c
common-adaptor/common-adaptor.c
history-adaptor/history-adaptor.c
provider/browser-provider-db.c
provider/browser-provider-requests.c

index 28e27903c26e53940ccdebc8ec8570bca1eece31..fb8e02b8857992c5b5d35ee3d2c80e3739ee4590 100755 (executable)
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -1,94 +1,32 @@
 ###############################################
 #
-# Tizen v4.0
+# Tizen v5.0
 #
-[obs.tizen_v4.0]
+[obs.tizen_v5.0]
 url = https://api.tizen.org
 
 ###############################################
 #
-# Tizen v4.0 for unified
+# Tizen v5.0 for unified
 #
-[repo.tz_v4.0_standard]
+[repo.tz_v5.0_standard]
 url = http://download.tizen.org/snapshots/tizen/unified/latest/repos/standard/packages/
 
-[repo.tz_v4.0_emulator]
+[repo.tz_v5.0_emulator]
 url = http://download.tizen.org/snapshots/tizen/unified/latest/repos/emulator/packages/
 
 ###############################################
 #
-# Tizen v4.0 for standard (armv7l)  : gbs -c .gbs.conf build -P profile.tz_armv7l_v4.0_standard -A armv7l --include-all
+# Tizen v5.0 for standard (armv7l)  : gbs -c .gbs.conf build -P profile.tz_armv7l_v5.0_standard -A armv7l --include-all
 #
 
-[profile.tz_armv7l_v4.0_standard]
-obs = obs.tizen_v4.0
-repos = repo.public_4.0_base_arm, repo.tz_v4.0_standard
-buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
+[profile.tz_armv7l_v5.0_standard]
+obs = obs.tizen_v5.0
+repos = repo.public_5.0_base_arm, repo.tz_v5.0_standard
+buildroot = ~/GBS-ROOT-MOBILE-ARM-WAYLAND
 
-[repo.public_4.0_base_arm]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
-
-###############################################
-#
-# Tizen v4.0 for standard (aarch64) : gbs -c .gbs.conf build -P profile.tz_aarch64_v4.0_standard -A aarch64 --include-all
-#
-[profile.tz_aarch64_v4.0_standard]
-obs = obs.tizen_v4.0
-repos = repo.public_4.0_base_arm64, repo.tz_v4.0_standard
-buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
-
-[repo.public_4.0_base_arm64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm64/packages/
-
-###############################################
-#
-# Tizen v4.0 for standard (xi86)
-#
-[profile.tz_ia32_v4.0_standard]
-obs = obs.tizen_v4.0
-repos = repo.public_4.0_base_ia32, repo.tz_v4.0_standard
-buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
-
-[repo.public_4.0_base_ia32]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/ia32/packages/
-
-###############################################
-#
-# Tizen v4.0 for standard (x86_64)
-#
-[profile.tz_x86_64_v4.0_standard]
-obs = obs.tizen_v4.0
-repos = repo.public_4.0_base_x86_64, repo.tz_v4.0_standard
-buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
-
-[repo.public_4.0_base_x86_64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/x86_64/packages/
-
-###############################################
-#
-# Tizen v4.0 for emulator (xi86)
-#
-[profile.tz_ia32_v4.0_emulator]
-obs = obs.tizen_v4.0
-repos = repo.public_4.0_base_ia32, repo.tz_v4.0_emulator
-buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
-
-[repo.public_4.0_base_ia32]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/ia32/packages/
-
-###############################################
-#
-# Tizen v4.0 for emulator (x86_64) : gbs -c .gbs.conf build -P profile.tz_x86_64_v4.0_emulator -A x86_64 --include-all
-#
-[profile.tz_x86_64_v4.0_emulator]
-obs = obs.tizen_v4.0
-repos = repo.public_4.0_base_x86_64, repo.tz_v4.0_emulator
-buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
-
-[repo.public_4.0_base_x86_64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/x86_64/packages/
-
-###############################################
+[repo.public_5.0_base_arm]
+url = http://download.tizen.org/snapshots/tizen/base/latest/repos/standard/packages/
 
 
 
index 9d54390a6ec0a6ba1bc00163253a988c8e02be29..d7933b66206cb8f45fe6801931e19fa28a3db943 100755 (executable)
@@ -32,42 +32,6 @@ extern bp_error_defs errorcode;
 int __browser_adaptor_connect(int callback);
 int __browser_adaptor_disconnect(void);
 
-static int __bp_bookmark_adaptor_get_blob(const int id,
-       bp_command_defs cmd, unsigned char **value, int *length)
-{
-       if (id < 0 || value == NULL || length == NULL)
-               return -1;
-
-       BP_CHECK_PROVIDER_STATUS;
-
-       int sock = BP_CHECK_IPC_SOCK;
-       g_bp_command.cmd = cmd;
-       g_bp_command.id = id;
-       int ret = bp_common_adaptor_get_blob(sock, &g_bp_command, value, length, &errorcode);
-       if (ret < 0 && errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
-       pthread_mutex_unlock(&g_adaptor_mutex);
-       return ret;
-}
-
-static int __bp_bookmark_adaptor_set_blob(const int id,
-       bp_command_defs cmd, const unsigned char *value, const int length)
-{
-       if (id < 0)
-               return -1;
-
-       BP_CHECK_PROVIDER_STATUS;
-
-       int sock = BP_CHECK_IPC_SOCK;
-       g_bp_command.cmd = cmd;
-       g_bp_command.id = id;
-       int ret = bp_common_adaptor_set_blob(sock, &g_bp_command, value, length, &errorcode);
-       if (ret < 0 && errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
-       pthread_mutex_unlock(&g_adaptor_mutex);
-       return ret;
-}
-
 static int __bp_bookmark_adaptor_get_blob_shm(const int id,
        bp_command_defs cmd, int *width, int *height, unsigned char **value,
        int *length)
index 613ebfae918438b48929208e8d38db23502756a2..fb11547b9d193ff4bb02d2ee388bccbc5a2abc37 100755 (executable)
@@ -708,13 +708,6 @@ int bp_common_adaptor_set_blob_shm(const int sock,
                                BP_PRINT_ERROR(cmd->id, *errorcode);
                                return -1;
                        }
-               } else {
-                       if (bp_shm_write(shm, (unsigned char *)value,
-                                       byte_length) < 0) {
-                               *errorcode = BP_ERROR_OUT_OF_MEMORY;
-                               BP_PRINT_ERROR(cmd->id, *errorcode);
-                               return -1;
-                       }
                }
                if (bp_adaptor_ipc_send_int(sock, width) < 0 ||
                                bp_adaptor_ipc_send_int(sock, height) < 0) {
index 076d87db96a50d8a540e03550050b5b11fa9a6e0..102a5d610e6a0d584315188764d0b08462f44040 100755 (executable)
@@ -197,25 +197,6 @@ static int __bp_history_adaptor_send_cmd(const int id, bp_command_defs cmd)
        return 0;
 }
 
-static int __bp_history_adaptor_get_blob(const int id,
-       bp_command_defs cmd, unsigned char **value, int *length)
-{
-       if (id < 0 || value == NULL || length == NULL)
-               return -1;
-
-       BP_CHECK_PROVIDER_STATUS;
-
-       int sock = BP_CHECK_IPC_SOCK;
-       errorcode = BP_ERROR_NONE;
-       g_bp_command.cmd = cmd;
-       g_bp_command.id = id;
-       int ret = bp_common_adaptor_get_blob(sock, &g_bp_command, value, length, &errorcode);
-       if (ret < 0 && errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
-       pthread_mutex_unlock(&g_adaptor_mutex);
-       return ret;
-}
-
 static int __bp_history_adaptor_get_blob_shm(const int id,
        bp_command_defs cmd, int *width, int *height, unsigned char **value,
        int *length)
index b303e684999907e61f5476a3cbda07f74da1fafb..9556d4ca35dfdc7042ed8b78df45288d9b8d2a09 100755 (executable)
@@ -1962,7 +1962,7 @@ char *bp_db_get_text_stmt(sqlite3_stmt* stmt, int index)
                getstr = (char *)calloc(getbytes + 1, sizeof(char));
                if (getstr != NULL) {
                        char *gettext = NULL;
-                       gettext = sqlite3_column_text(stmt, index);
+                       gettext = (char *)sqlite3_column_text(stmt, index);
                        if (gettext != NULL) {
                                memcpy(getstr, gettext,
                                                getbytes * sizeof(char));
index ebf69bccf7000162d9b99a5a87df91599e209218..49a2ac0ee54c532ab57097bfdc377492ff8d8708 100755 (executable)
@@ -1584,7 +1584,7 @@ char *bp_get_my_deviceid()
                        for (i = 0; i < 16; i++)
                                digest[i] = '0' + (digest[i] % 10);
 
-                       device_id = strdup(digest);
+                       device_id = strdup((char *)digest);
                        free(imei);
                }
        }