From fff18e0dd41f22e97b3ca78497e7cb2f20c924ea Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Mon, 3 Jun 2019 03:36:48 -0500
Subject: [PATCH] fix to possible memory corruption

---
 dbcon/execplan/arithmeticcolumn.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dbcon/execplan/arithmeticcolumn.cpp b/dbcon/execplan/arithmeticcolumn.cpp
index aab6c9265..2128a47ed 100644
--- a/dbcon/execplan/arithmeticcolumn.cpp
+++ b/dbcon/execplan/arithmeticcolumn.cpp
@@ -326,7 +326,8 @@ void ArithmeticColumn::serialize(messageqcpp::ByteStream& b) const
     ObjectReader::writeParseTree(fExpression, b);
     b << fTableAlias;
     b << fData;
-    b << static_cast<const ByteStream::doublebyte>(fAsc);
+    const ByteStream::doublebyte tmp = fAsc;
+    b << tmp;
 }
 
 void ArithmeticColumn::unserialize(messageqcpp::ByteStream& b)
@@ -340,7 +341,9 @@ void ArithmeticColumn::unserialize(messageqcpp::ByteStream& b)
     fExpression = ObjectReader::createParseTree(b);
     b >> fTableAlias;
     b >> fData;
-    b >> reinterpret_cast< ByteStream::doublebyte&>(fAsc);
+    ByteStream::doublebyte tmp;
+    b >> tmp;
+    fAsc = (tmp);
 
     fSimpleColumnList.clear();
     fExpression->walk(getSimpleCols, &fSimpleColumnList);