tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Loading state files was broken. 

Fixes #3562
This commit is contained in:
Gunnar Beutner 2013-01-30 10:52:52 +01:00
parent 6e119dafee
commit c9bcc5c8bd
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base/dynamicobject.cpp
View File

@ -390,6 +390,8 @@ void DynamicObject::RestoreObjects(const String& filename)
StdioStream::Ptr sfp = boost::make_shared<StdioStream>(&fp, false); StdioStream::Ptr sfp = boost::make_shared<StdioStream>(&fp, false);
sfp->Start(); sfp->Start();
unsigned long restored = 0;
String message; String message;
while (NetString::ReadStringFromStream(sfp, &message)) { while (NetString::ReadStringFromStream(sfp, &message)) {
Dictionary::Ptr persistentObject = Value::Deserialize(message); Dictionary::Ptr persistentObject = Value::Deserialize(message);
@ -413,9 +415,15 @@ void DynamicObject::RestoreObjects(const String& filename)
} else if (object) { } else if (object) {
object->ApplyUpdate(update, Attribute_All); object->ApplyUpdate(update, Attribute_All);
} }
restored++;
} }
sfp->Close(); sfp->Close();
stringstream msgbuf;
msgbuf << "Restored " << restored << " objects";
Logger::Write(LogInformation, "base", msgbuf.str());
} }
void DynamicObject::DeactivateObjects(void) void DynamicObject::DeactivateObjects(void)

36
lib/base/netstring.cpp
View File

@ -32,24 +32,17 @@ using namespace icinga;
*/ */
bool NetString::ReadStringFromStream(const Stream::Ptr& stream, String *str) bool NetString::ReadStringFromStream(const Stream::Ptr& stream, String *str)
{ {
size_t buffer_length = stream->GetAvailableBytes(); /* 16 bytes are enough for the header */
size_t peek_length, buffer_length = 16;
/* minimum netString length is 3 */
if (buffer_length < 3)
return false;
/* limit the number of bytes we're reading for the header */
if (buffer_length > 16)
buffer_length = 16;
char *buffer = static_cast<char *>(malloc(buffer_length)); char *buffer = static_cast<char *>(malloc(buffer_length));
if (buffer == NULL && buffer_length > 0) if (buffer == NULL)
throw_exception(bad_alloc()); throw_exception(bad_alloc());
buffer_length = stream->Peek(buffer, buffer_length); peek_length = stream->Peek(buffer, buffer_length);
if (buffer_length < 3) { /* minimum netString length is 3 */
if (peek_length < 3) {
free(buffer); free(buffer);
return false; return false;
} }
@ -63,7 +56,7 @@ bool NetString::ReadStringFromStream(const Stream::Ptr& stream, String *str)
size_t len, i; size_t len, i;
len = 0; len = 0;
for (i = 0; i < buffer_length && isdigit(buffer[i]); i++) { for (i = 0; i < peek_length && isdigit(buffer[i]); i++) {
/* length specifier must have at most 9 characters */ /* length specifier must have at most 9 characters */
if (i >= 9) { if (i >= 9) {
free(buffer); free(buffer);
@ -73,13 +66,7 @@ bool NetString::ReadStringFromStream(const Stream::Ptr& stream, String *str)
len = len * 10 + (buffer[i] - '0'); len = len * 10 + (buffer[i] - '0');
} }
buffer_length = stream->GetAvailableBytes(); /* read the whole message */
/* make sure the buffer is large enough */
if (i + len + 1 >= buffer_length)
return false;
/* limit the number of bytes we're reading to this message */
buffer_length = i + 1 + len + 1; buffer_length = i + 1 + len + 1;
char *new_buffer = static_cast<char *>(realloc(buffer, buffer_length)); char *new_buffer = static_cast<char *>(realloc(buffer, buffer_length));
@ -91,7 +78,10 @@ bool NetString::ReadStringFromStream(const Stream::Ptr& stream, String *str)
buffer = new_buffer; buffer = new_buffer;
stream->Peek(buffer, buffer_length); peek_length = stream->Peek(buffer, buffer_length);
if (peek_length < buffer_length)
return false;
/* check for the colon delimiter */ /* check for the colon delimiter */
if (buffer[i] != ':') { if (buffer[i] != ':') {
@ -110,7 +100,7 @@ bool NetString::ReadStringFromStream(const Stream::Ptr& stream, String *str)
free(buffer); free(buffer);
/* remove the data from the stream */ /* remove the data from the stream */
stream->Read(NULL, buffer_length); stream->Read(NULL, peek_length);
return true; return true;
} }