Control: tags 833449 + patch Control: tags 833449 + pending Control: severity 833449 serious
Hey, This bug breaks projects which depend on google-mock, so I've gone ahead and uploaded this as a delayed NMU to DELAYED/7. Feel free to cancel or reschedule if you want. Cheers, -- Iain Lane [ [email protected] ] Debian Developer [ [email protected] ] Ubuntu Developer [ [email protected] ]
diff -Nru google-mock-1.7.0-18092013/debian/changelog google-mock-1.7.0-18092013/debian/changelog --- google-mock-1.7.0-18092013/debian/changelog 2016-06-29 18:39:43.000000000 +0100 +++ google-mock-1.7.0-18092013/debian/changelog 2016-08-04 15:43:53.000000000 +0100 @@ -1,3 +1,15 @@ +google-mock (1.7.0-18092013-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * The previous upload fixed google-mock for its own testsuite, but not for + client projects. Backport a patch from an upstream issue to modify some + functions to not return NULL, working around the problem caused for + google-mock itself and for its clients. (Closes: #833449) (LP: #1609793) + * This means we don't need -fno-delete-null-pointer-checks any more, so + remove that workaround. + + -- Iain Lane <[email protected]> Thu, 04 Aug 2016 15:37:37 +0100 + google-mock (1.7.0-18092013-2) unstable; urgency=medium * Use -fno-delete-null-pointer-checks to work with gcc 6. diff -Nru google-mock-1.7.0-18092013/debian/patches/gcc6-action-result-holder-crash-fix.patch google-mock-1.7.0-18092013/debian/patches/gcc6-action-result-holder-crash-fix.patch --- google-mock-1.7.0-18092013/debian/patches/gcc6-action-result-holder-crash-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ google-mock-1.7.0-18092013/debian/patches/gcc6-action-result-holder-crash-fix.patch 2016-08-04 15:32:56.000000000 +0100 @@ -0,0 +1,33 @@ +Author: Romain Geissler +Origin: https://github.com/google/googletest/issues/705#issuecomment-235067917 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/google-mock/+bug/1609793 + +--- google-mock-1.7.0-18092013.orig/include/gmock/gmock-spec-builders.h ++++ google-mock-1.7.0-18092013/include/gmock/gmock-spec-builders.h +@@ -1370,6 +1370,8 @@ class ActionResultHolder : public Untype + template <> + class ActionResultHolder<void> : public UntypedActionResultHolderBase { + public: ++ explicit ActionResultHolder() {} ++ + void GetValueAndDelete() const { delete this; } + + virtual void PrintAsActionResult(::std::ostream* /* os */) const {} +@@ -1381,7 +1383,7 @@ class ActionResultHolder<void> : public + const typename Function<F>::ArgumentTuple& args, + const string& call_description) { + func_mocker->PerformDefaultAction(args, call_description); +- return NULL; ++ return new ActionResultHolder(); + } + + // Performs the given action and returns NULL. +@@ -1390,7 +1392,7 @@ class ActionResultHolder<void> : public + const Action<F>& action, + const typename Function<F>::ArgumentTuple& args) { + action.Perform(args); +- return NULL; ++ return new ActionResultHolder(); + } + }; + diff -Nru google-mock-1.7.0-18092013/debian/patches/series google-mock-1.7.0-18092013/debian/patches/series --- google-mock-1.7.0-18092013/debian/patches/series 2013-07-27 20:46:26.000000000 +0100 +++ google-mock-1.7.0-18092013/debian/patches/series 2016-08-04 15:31:46.000000000 +0100 @@ -1 +1,2 @@ debian-changes-1.4.0-1 +gcc6-action-result-holder-crash-fix.patch diff -Nru google-mock-1.7.0-18092013/debian/rules google-mock-1.7.0-18092013/debian/rules --- google-mock-1.7.0-18092013/debian/rules 2016-06-29 16:36:21.000000000 +0100 +++ google-mock-1.7.0-18092013/debian/rules 2016-08-04 15:57:10.000000000 +0100 @@ -7,8 +7,6 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -CXXFLAGS += -fno-delete-null-pointer-checks - %: dh $@
signature.asc
Description: PGP signature
