Fix a premature object destruction bug. Thank you AddressSanitizer.

phusion · Jul 12, 2012 · 795e8bb · 795e8bb
1 parent b8011ec
commit 795e8bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ext/common/EventedBufferedInput.h b/ext/common/EventedBufferedInput.h
@@ -84,6 +84,9 @@ class EventedBufferedInput: public enable_shared_from_this< EventedBufferedInput
 	}
 
 	void onReadable(ev::io &watcher, int revents) {
+		// Keep 'this' alive until function exit.
+		shared_ptr< EventedBufferedInput<bufferSize> > self = EventedBufferedInput<bufferSize>::shared_from_this();
+
 		ssize_t ret = syscalls::read(fd, bufferData, bufferSize);
 		if (ret == -1) {
 			if (errno != EAGAIN) {
@@ -97,8 +100,7 @@ class EventedBufferedInput: public enable_shared_from_this< EventedBufferedInput
 				state = READ_ERROR;
 				paused = true;
 				if (onError != NULL) {
-					onError(EventedBufferedInput<bufferSize>::shared_from_this(),
-						"Cannot read from socket", error);
+					onError(self, "Cannot read from socket", error);
 				}
 			}
 
@@ -111,8 +113,7 @@ class EventedBufferedInput: public enable_shared_from_this< EventedBufferedInput
 			watcher.stop();
 			state = END_OF_STREAM;
 			paused = true;
-			onData(EventedBufferedInput<bufferSize>::shared_from_this(),
-				StaticString());
+			onData(self, StaticString());
 
 		} else {
 			assert(state == LIVE);
@@ -153,7 +154,6 @@ class EventedBufferedInput: public enable_shared_from_this< EventedBufferedInput
 		}
 
 		assert(buffer.size() > 0);
-
 		size_t consumed = onData(EventedBufferedInput<bufferSize>::shared_from_this(),
 			buffer);
 		if (state == CLOSED) {

diff --git a/ext/common/agents/Base.cpp b/ext/common/agents/Base.cpp
@@ -508,7 +508,7 @@ dumpDiagnostics(AbortHandlerState &state) {
 	write(STDERR_FILENO, messageBuf, end - messageBuf);
 
 	#ifdef LIBC_HAS_BACKTRACE_FUNC
-		runInSubprocessWithTimeLimit(state, dumpBacktrace, NULL, 2000);
+		runInSubprocessWithTimeLimit(state, dumpBacktrace, NULL, 4000);
 	#endif
 
 	safePrintErr("--------------------------------------\n");