From b4991548c80b2bcac37ea5f2eb7d8b6dfec63d03 Mon Sep 17 00:00:00 2001 From: Tim Shen Date: Fri, 28 Oct 2016 22:45:33 +0000 Subject: [APFloat] Fix memory bugs revealed by MSan Reviewers: eugenis, hfinkel, kbarton, iteratee, echristo Subscribers: mehdi_amini, llvm-commits Differential Revision: https://reviews.llvm.org/D26102 llvm-svn: 285468 --- llvm/lib/Support/APFloat.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Support/APFloat.cpp') diff --git a/llvm/lib/Support/APFloat.cpp b/llvm/lib/Support/APFloat.cpp index 05afa06a552..20e7841129d 100644 --- a/llvm/lib/Support/APFloat.cpp +++ b/llvm/lib/Support/APFloat.cpp @@ -818,7 +818,10 @@ IEEEFloat::IEEEFloat(const fltSemantics &ourSemantics) { sign = false; } -IEEEFloat::IEEEFloat(const fltSemantics &ourSemantics, uninitializedTag tag) { +// Delegate to the previous constructor, because later copy constructor may +// actually inspects category, which can't be garbage. +IEEEFloat::IEEEFloat(const fltSemantics &ourSemantics, uninitializedTag tag) + : IEEEFloat(ourSemantics) { // Allocates storage if necessary but does not initialize it. initialize(&ourSemantics); } @@ -3877,7 +3880,9 @@ DoubleAPFloat::DoubleAPFloat(const fltSemantics &S, APFloat &&First, DoubleAPFloat::DoubleAPFloat(const DoubleAPFloat &RHS) : Semantics(RHS.Semantics), - Floats(new APFloat[2]{APFloat(RHS.Floats[0]), APFloat(RHS.Floats[1])}) { + Floats(RHS.Floats ? new APFloat[2]{APFloat(RHS.Floats[0]), + APFloat(RHS.Floats[1])} + : nullptr) { assert(Semantics == &PPCDoubleDouble); } @@ -3888,7 +3893,7 @@ DoubleAPFloat::DoubleAPFloat(DoubleAPFloat &&RHS) } DoubleAPFloat &DoubleAPFloat::operator=(const DoubleAPFloat &RHS) { - if (Semantics == RHS.Semantics) { + if (Semantics == RHS.Semantics && RHS.Floats) { Floats[0] = RHS.Floats[0]; Floats[1] = RHS.Floats[1]; } else if (this != &RHS) { -- cgit v1.2.3