summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Aggarwal <aggarwal.s@samsung.com>2016-06-22 09:16:36 +0530
committerSumit Aggarwal <aggarwal.s@samsung.com>2016-07-21 20:24:30 +0530
commit28649cb5bad75b5886accb587e855b81ee02838f (patch)
treef4c535e03218c9164191fa0fc94d218dbcae66e8
parente072cd561639e3b27ed9a586d9f60d377b78e960 (diff)
downloadconnman-28649cb5bad75b5886accb587e855b81ee02838f.tar.gz
connman-28649cb5bad75b5886accb587e855b81ee02838f.tar.bz2
connman-28649cb5bad75b5886accb587e855b81ee02838f.zip
Fixed Prevent issue.
Change-Id: I096b52d76d46354c1e39734e13a110d359a514c3 Signed-off-by: Sumit Aggarwal <aggarwal.s@samsung.com>
-rwxr-xr-xgdhcp/common.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/gdhcp/common.c b/gdhcp/common.c
index 6d457ac5..16cba59c 100755
--- a/gdhcp/common.c
+++ b/gdhcp/common.c
@@ -70,7 +70,11 @@ int dhcp_get_random(uint64_t *val)
random_fd = open(URANDOM, O_RDONLY);
if (random_fd < 0) {
r = -errno;
+#if defined TIZEN_EXT
+ *val = (uint64_t) random();
+#else
*val = random();
+#endif
return r;
}
@@ -78,7 +82,11 @@ int dhcp_get_random(uint64_t *val)
if (read(random_fd, val, sizeof(uint64_t)) < 0) {
r = -errno;
+#if defined TIZEN_EXT
+ *val = (uint64_t) random();
+#else
*val = random();
+#endif
return r;
}
@@ -192,7 +200,11 @@ static const uint8_t len_of_option_as_string[] = {
static int sprint_nip(char *dest, const char *pre, const uint8_t *ip)
{
+#if defined TIZEN_EXT
+ return snprintf(dest, strlen(pre) + 16,"%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
+#else
return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
+#endif
}
/* Create "opt_value1 option_value2 ..." string */
@@ -220,12 +232,20 @@ char *malloc_option_value_string(uint8_t *option, GDHCPOptionType type)
break;
case OPTION_U16: {
uint16_t val_u16 = get_be16(option);
+#if defined TIZEN_EXT
+ dest += snprintf(dest, upper_length + 1, "%u", val_u16);
+#else
dest += sprintf(dest, "%u", val_u16);
+#endif
break;
}
case OPTION_U32: {
uint32_t val_u32 = get_be32(option);
+#if defined TIZEN_EXT
+ dest += snprintf(dest, upper_length + 1, "%u", val_u32);
+#else
dest += sprintf(dest, "%u", val_u32);
+#endif
break;
}
case OPTION_STRING: