peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault in gmock when running tests (#514)

Browse Source 
Taken from https://github.com/google/googletest/issues/705#issuecomment-235067917
This commit is contained in:
Peter-Levine
2017-07-24 10:14:23 -04:00
committed by Jesse Beder
parent 11607eb5bf
commit efbfa1c7c7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
View File

@@ -1370,6 +1370,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
template <> template <>
class ActionResultHolder<void> : public UntypedActionResultHolderBase { class ActionResultHolder<void> : public UntypedActionResultHolderBase {
public: public:
explicit ActionResultHolder() {}
void GetValueAndDelete() const { delete this; } void GetValueAndDelete() const { delete this; }
virtual void PrintAsActionResult(::std::ostream* /* os */) const {} virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
@@ -1381,7 +1383,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
const typename Function<F>::ArgumentTuple& args, const typename Function<F>::ArgumentTuple& args,
const string& call_description) { const string& call_description) {
func_mocker->PerformDefaultAction(args, call_description); func_mocker->PerformDefaultAction(args, call_description);
return NULL; return new ActionResultHolder();
} }
// Performs the given action and returns NULL. // Performs the given action and returns NULL.
@@ -1390,7 +1392,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
const Action<F>& action, const Action<F>& action,
const typename Function<F>::ArgumentTuple& args) { const typename Function<F>::ArgumentTuple& args) {
action.Perform(args); action.Perform(args);
return NULL; return new ActionResultHolder();
} }
}; };