Fix PackedVarying's move constructor

The move constructor was calling the move assignment operator, which used std::swap on the members. However, `this` was not constructed, so std::swap was operating on uninitialized values. Caught by UBSAN. Bug: chromium:1159444 Change-Id: I65f2f0affd1461f880c59780f31a368779411f24 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2599936Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Ian Elliott <ianelliott@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Fix PackedVarying's move constructor
4e2b6d6b · Shahbaz Youssefi · Commit Bot · 4ebcee3e · 4e2b6d6b
Commit 4e2b6d6b authored Dec 21, 2020 by Shahbaz Youssefi Committed by Commit Bot Dec 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 8 deletions

VaryingPacking.cpp src/libANGLE/VaryingPacking.cpp +13 -8

No files found.
--- a/src/libANGLE/VaryingPacking.cpp
+++ b/src/libANGLE/VaryingPacking.cpp
@@ -98,9 +98,11 @@ VaryingInShaderRef::VaryingInShaderRef(ShaderType stageIn, const sh::ShaderVaria
 VaryingInShaderRef::~VaryingInShaderRef() = default;
 VaryingInShaderRef::VaryingInShaderRef(VaryingInShaderRef &&other)
-{
+    : varying(other.varying),
-    *this = std::move(other);
+      stage(other.stage),
-}
+      parentStructName(std::move(other.parentStructName)),
+      parentStructMappedName(std::move(other.parentStructMappedName))
+{}
 VaryingInShaderRef &VaryingInShaderRef::operator=(VaryingInShaderRef &&other)
 {
@@ -142,11 +144,14 @@ PackedVarying::PackedVarying(VaryingInShaderRef &&frontVaryingIn,
 PackedVarying::~PackedVarying() = default;
 PackedVarying::PackedVarying(PackedVarying &&other)
-    : frontVarying(other.frontVarying.stage, other.frontVarying.varying),
+    : frontVarying(std::move(other.frontVarying)),
-      backVarying(other.backVarying.stage, other.backVarying.varying)
+      backVarying(std::move(other.backVarying)),
-{
+      interpolation(other.interpolation),
-    *this = std::move(other);
+      arrayIndex(other.arrayIndex),
-}
+      isTransformFeedback(other.isTransformFeedback),
+      fieldIndex(other.fieldIndex),
+      secondaryFieldIndex(other.secondaryFieldIndex)
+{}
 PackedVarying &PackedVarying::operator=(PackedVarying &&other)
 {