Fix sdk_x86 build
(cherry picked from commit 26b8c9d432adc2fc71438050377cb6106dffde1a)
(cherry picked from commit 2fc2bd6aaa1c9a743f2d2bb9d81ab1570e510923)
Change-Id: I20a705cb83279ff6b6fdc4a543853e020eb34a04
diff --git a/src/common_test.h b/src/common_test.h
index a3e530b..ea5e96b 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -80,10 +80,12 @@
c = 0;
// prevent g < 0 which would potentially allow an overflow later
if (--g < 0) {
+ *dst_size = 0;
return NULL;
}
} else if (g != 3) {
// we only allow = to be at the end
+ *dst_size = 0;
return NULL;
}
t = (t << 6) | c;
@@ -99,11 +101,14 @@
}
}
if (y != 0) {
+ *dst_size = 0;
return NULL;
}
UniquePtr<byte[]> dst(new byte[tmp.size()]);
if (dst_size != NULL) {
*dst_size = tmp.size();
+ } else {
+ *dst_size = 0;
}
std::copy(tmp.begin(), tmp.end(), dst.get());
return dst.release();