Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #380 from PhenomRetroShare/Fix_ContentValue

Browse Source 
Fix ContentValue::ContentValue if GetAsxxx return false.
This commit is contained in:
Cyril Soler 2016-05-12 14:42:31 -04:00
commit 4b8a1d2570
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libretroshare/src/util/contentvalue.cc
View File

@ -73,42 +73,44 @@ ContentValue::ContentValue(const ContentValue &from){
case INT32_TYPE:
{
int32_t value;
from.getAsInt32(currKey, value);
put(currKey, value);
int32_t value = 0;
if (from.getAsInt32(currKey, value))
put(currKey, value);
break;
}
case INT64_TYPE:
{
int64_t value;
from.getAsInt64(currKey, value);
put(currKey, value);
int64_t value = 0;
if (from.getAsInt64(currKey, value))
put(currKey, value);
break;
}
case STRING_TYPE:
{
from.getAsString(currKey, val);
put(currKey, val);
if (from.getAsString(currKey, val))
put(currKey, val);
break;
}
case BOOL_TYPE:
{
bool value;
from.getAsBool(currKey, value);
put(currKey, value);
bool value = false;
if (from.getAsBool(currKey, value))
put(currKey, value);
break;
}
case DATA_TYPE:
{
from.getAsData(currKey, data_len, src);
put(currKey, data_len, src);
if (from.getAsData(currKey, data_len, src))
put(currKey, data_len, src);
break;
}
case DOUBLE_TYPE:
double value;
from.getAsDouble(currKey, value);
put(currKey, value);
break;
{
double value = 0;
if (from.getAsDouble(currKey, value))
put(currKey, value);
break;
}
default:
std::cerr << "ContentValue::ContentValue(ContentValue &from):"
<< "Error! Unrecognised data type!" << std::endl;