Mike Magruder
f4bed8899a
We force users to use the create() methods of StaticResultWaitHandle and StaticExceptionWaitHandle, which properly set m_resultOrException. However, deserialization will use the normal constructor which was failing to initialize the field. The destructor, then, would operate on random data. This broke hphpd when a stack trace had one of these objects on it somewhere. The 'where' command would succeed, but the next command (which deletes the stack trace), would segfault in the wait handle's destructor. I think it's fair to not serialize this member. It's not exposed thru PHP except via joining with the wait handle, and I think an argument can be made that it's just plain wrong to join with a deserialized copy of a wait handle. So I've just initialized it to a reasonable default.
65 linhas
2.4 KiB
C++
65 linhas
2.4 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
| Copyright (c) 1997-2010 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include "hphp/runtime/ext/ext_asio.h"
|
|
#include "hphp/system/systemlib.h"
|
|
|
|
namespace HPHP {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
namespace {
|
|
StaticString s_staticException("<static-exception>");
|
|
}
|
|
|
|
c_StaticExceptionWaitHandle::c_StaticExceptionWaitHandle(Class* cb)
|
|
: c_StaticWaitHandle(cb) {
|
|
setState(STATE_FAILED);
|
|
}
|
|
|
|
c_StaticExceptionWaitHandle::~c_StaticExceptionWaitHandle() {
|
|
tvRefcountedDecRefCell(&m_resultOrException);
|
|
}
|
|
|
|
void c_StaticExceptionWaitHandle::t___construct() {
|
|
Object e(SystemLib::AllocInvalidOperationExceptionObject(
|
|
"Use StaticExceptionWaitHandle::create() instead of constructor"));
|
|
throw e;
|
|
}
|
|
|
|
Object c_StaticExceptionWaitHandle::ti_create(CObjRef exception) {
|
|
if (!exception.instanceof(SystemLib::s_ExceptionClass)) {
|
|
Object e(SystemLib::AllocInvalidArgumentExceptionObject(
|
|
"Expected exception to be an instance of Exception"));
|
|
throw e;
|
|
}
|
|
|
|
return Create(exception.get());
|
|
}
|
|
|
|
p_StaticExceptionWaitHandle c_StaticExceptionWaitHandle::Create(ObjectData* exception) {
|
|
p_StaticExceptionWaitHandle wh = NEWOBJ(c_StaticExceptionWaitHandle)();
|
|
tvWriteObject(exception, &wh->m_resultOrException);
|
|
return wh;
|
|
}
|
|
|
|
String c_StaticExceptionWaitHandle::getName() {
|
|
return s_staticException;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}
|