projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
service
/
easy-setup
/
sampleapp
/
enrollee
/
linux
/
easysetup_x.c
diff --git
a/service/easy-setup/sampleapp/enrollee/linux/easysetup_x.c
b/service/easy-setup/sampleapp/enrollee/linux/easysetup_x.c
index
aaa351b
..
d7a2773
100755
(executable)
--- a/
service/easy-setup/sampleapp/enrollee/linux/easysetup_x.c
+++ b/
service/easy-setup/sampleapp/enrollee/linux/easysetup_x.c
@@
-48,18
+48,25
@@
void ReadUserdataCb(OCRepPayload* payload, char* resourceType, void** userdata)
if(payload != NULL)
{
if(payload != NULL)
{
- if(strstr(resourceType, OC_RSRVD_ES_RES_TYPE_WIFI))
+ if(strstr(resourceType, OC_RSRVD_ES_RES_TYPE_WIFI
CONF
))
{
int64_t value = -1;
if (OCRepPayloadGetPropInt(payload, USERPROPERTY_KEY_INT, &value))
{
{
int64_t value = -1;
if (OCRepPayloadGetPropInt(payload, USERPROPERTY_KEY_INT, &value))
{
- if(*userdata
!
= NULL)
+ if(*userdata
=
= NULL)
{
*userdata = (void*)OICMalloc(sizeof(UserProperties));
{
*userdata = (void*)OICMalloc(sizeof(UserProperties));
+ if( *userdata == NULL )
+ {
+ OIC_LOG(ERROR, ESX_ENROLLEE_TAG, "OICMalloc for UserProperties is failed");
+ return ;
+ }
+ memset(*userdata, 0, sizeof(UserProperties));
}
}
+
+ ((UserProperties*)(*userdata))->userValue_int = value;
OIC_LOG_V(INFO, ESX_ENROLLEE_TAG, "[User specific property] %s : %ld",
USERPROPERTY_KEY_INT, value);
OIC_LOG_V(INFO, ESX_ENROLLEE_TAG, "[User specific property] %s : %ld",
USERPROPERTY_KEY_INT, value);
- ((UserProperties*)(*userdata))->userValue_int = value;
g_userProperties.userValue_int = value;
}
}
g_userProperties.userValue_int = value;
}
}
@@
-74,7
+81,7
@@
void WriteUserdataCb(OCRepPayload* payload, char* resourceType)
if(payload != NULL)
{
if(payload != NULL)
{
- if(strstr(resourceType, OC_RSRVD_ES_RES_TYPE_WIFI))
+ if(strstr(resourceType, OC_RSRVD_ES_RES_TYPE_WIFI
CONF
))
{
OCRepPayloadSetPropInt(payload, USERPROPERTY_KEY_INT, g_userProperties.userValue_int);
}
{
OCRepPayloadSetPropInt(payload, USERPROPERTY_KEY_INT, g_userProperties.userValue_int);
}