maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ActiveSync: check for unexpected NULL pointers (BMC #22048)

Browse source 
There have been cases where libeassync returns NULL pointers
without an error. This caused crashes in SyncEvolution. Now
SyncEvolution checks all plain C pointers for NULL and (when
a non-empty string is expected) also for the empty string.

activesyncd commit ID:
2a8dd3d7a263bccf7bbf0a2a7623072a909c5c7b
This commit is contained in:
Patrick Ohly 2011-08-12 16:00:59 +02:00
parent 598aa44595
commit 3014fe0497
2 changed files with 73 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/backends/activesync/ActiveSyncCalendarSource.cpp
View file

@ -107,6 +107,9 @@ void ActiveSyncCalendarSource::beginSync(const std::string &lastToken, const std
gerror)) {
gerror.throwError("reading ActiveSync changes");
}
if (!buffer) {
throwError("reading changes: empty sync key returned");
}
// TODO: Test that we really get an empty token here for an unexpected slow
// sync. If not, we'll start an incremental sync here and later the engine
@ -115,8 +118,17 @@ void ActiveSyncCalendarSource::beginSync(const std::string &lastToken, const std
// populate ID lists and content cache
BOOST_FOREACH(EasItemInfo *item, created) {
if (!item->server_id) {
throwError("no server ID for new eas item");
}
string easid(item->server_id);
if (easid.empty()) {
throwError("empty server ID for new eas item");
}
SE_LOG_DEBUG(this, NULL, "new eas item %s", easid.c_str());
if (!item->data) {
throwError(StringPrintf("no body returned for new eas item %s", easid.c_str()));
}
Event &event = setItemData(easid, item->data);
BOOST_FOREACH(const std::string &subid, event.m_subids) {
SE_LOG_DEBUG(this, NULL, "new eas item %s = uid %s + rid %s",
@ -125,8 +137,17 @@ void ActiveSyncCalendarSource::beginSync(const std::string &lastToken, const std
}
}
BOOST_FOREACH(EasItemInfo *item, updated) {
if (!item->server_id) {
throwError("no server ID for updated eas item");
}
string easid(item->server_id);
if (easid.empty()) {
throwError("empty server ID for updated eas item");
}
SE_LOG_DEBUG(this, NULL, "updated eas item %s", easid.c_str());
if (!item->data) {
throwError(StringPrintf("no body returned for updated eas item %s", easid.c_str()));
}
Event &event = setItemData(easid, item->data);
BOOST_FOREACH(const std::string &subid, event.m_subids) {
SE_LOG_DEBUG(this, NULL, "deleted eas item %s = uid %s + rid %s",
@ -135,7 +156,13 @@ void ActiveSyncCalendarSource::beginSync(const std::string &lastToken, const std
}
}
BOOST_FOREACH(const char *serverID, deleted) {
if (!serverID) {
throwError("no server ID for deleted eas item");
}
string easid(serverID);
if (easid.empty()) {
throwError("empty server ID for deleted eas item");
}
Event &event = findItem(easid);
if (event.m_subids.empty()) {
SE_LOG_DEBUG(this, NULL, "deleted eas item %s empty?!", easid.c_str());

50
src/backends/activesync/ActiveSyncSource.cpp
View file

@ -105,6 +105,9 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
gerror)) {
gerror.throwError("reading ActiveSync changes");
}
if (!buffer) {
throwError("reading changes: empty sync key returned");
}
// TODO: Test that we really get an empty token here for an unexpected slow
// sync. If not, we'll start an incremental sync here and later the engine
@ -112,21 +115,45 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
// populate ID lists and content cache
BOOST_FOREACH(EasItemInfo *item, created) {
if (!item->server_id) {
throwError("no server ID for new eas item");
}
string luid(item->server_id);
if (luid.empty()) {
throwError("empty server ID for new eas item");
}
SE_LOG_DEBUG(this, NULL, "new item %s", luid.c_str());
addItem(luid, NEW);
m_ids->setProperty(luid, "1");
if (!item->data) {
throwError(StringPrintf("no body returned for new eas item %s", luid.c_str()));
}
m_items[luid] = item->data;
}
BOOST_FOREACH(EasItemInfo *item, updated) {
if (!item->server_id) {
throwError("no server ID for updated eas item");
}
string luid(item->server_id);
if (luid.empty()) {
throwError("empty server ID for updated eas item");
}
SE_LOG_DEBUG(this, NULL, "updated item %s", luid.c_str());
addItem(luid, UPDATED);
// m_ids.setProperty(luid, "1"); not necessary, should already exist (TODO: check?!)
if (!item->data) {
throwError(StringPrintf("no body returned for updated eas item %s", luid.c_str()));
}
m_items[luid] = item->data;
}
BOOST_FOREACH(const char *serverID, deleted) {
if (!serverID) {
throwError("no server ID for deleted eas item");
}
string luid(serverID);
if (luid.empty()) {
throwError("empty server ID for deleted eas item");
}
SE_LOG_DEBUG(this, NULL, "deleted item %s", luid.c_str());
addItem(luid, DELETED);
m_ids->removeProperty(luid);
@ -176,7 +203,10 @@ void ActiveSyncSource::deleteItem(const string &luid)
m_folder.c_str(),
items,
gerror)) {
gerror.throwError("deleting ActiveSync item");
gerror.throwError("deleting eas item");
}
if (!buffer) {
throwError("delete items: empty sync key returned");
}
// remove from item list
@ -220,10 +250,16 @@ SyncSourceSerialize::InsertItemResult ActiveSyncSource::insertItem(const std::st
m_folder.c_str(),
items,
gerror)) {
gerror.throwError("adding ActiveSync item");
gerror.throwError("adding eas item");
}
if (!item->server_id) {
throwError("no server ID for new eas item");
}
// get new ID from updated item
res.m_luid = item->server_id;
if (res.m_luid.empty()) {
throwError("empty server ID for new eas item");
}
// TODO: if someone else has inserted a new calendar item
// with the same UID as the one we are trying to insert here,
@ -239,10 +275,13 @@ SyncSourceSerialize::InsertItemResult ActiveSyncSource::insertItem(const std::st
m_folder.c_str(),
items,
gerror)) {
gerror.throwError("updating ActiveSync item");
gerror.throwError("updating eas item");
}
res.m_luid = luid;
}
if (!buffer) {
throwError("insert item: empty sync key returned");
}
// add/update in cache
if (m_ids) {
@ -270,7 +309,10 @@ void ActiveSyncSource::readItem(const std::string &luid, std::string &item)
tmp,
getEasType(),
gerror)) {
gerror.throwError("reading ActiveSync item");
gerror.throwError(StringPrintf("reading eas item %s", luid.c_str()));
}
if (!tmp->data) {
throwError(StringPrintf("no body returned for eas item %s", luid.c_str()));
}
item = tmp->data;
} else {