Commit ea0e2506 authored by Alexander Barkov's avatar Alexander Barkov

Fixing valgrind warning: uninitialized memory read.

modified:
  storage/connect/ha_connect.cc
parent 1b7a9079
...@@ -1561,14 +1561,14 @@ int ha_connect::ScanRecord(PGLOBAL g, uchar *buf) ...@@ -1561,14 +1561,14 @@ int ha_connect::ScanRecord(PGLOBAL g, uchar *buf)
} // endif sdval } // endif sdval
fp->val_str(&attribute); fp->val_str(&attribute);
sdval->SetValue_psz(attribute.c_ptr()); sdval->SetValue_psz(attribute.c_ptr_safe());
value->SetValue_pval(sdval); value->SetValue_pval(sdval);
break; break;
default: default:
fp->val_str(&attribute); fp->val_str(&attribute);
if (charset == &my_charset_bin) if (charset == &my_charset_bin)
{ {
value->SetValue_psz(attribute.c_ptr()); value->SetValue_psz(attribute.c_ptr_safe());
} }
else else
{ {
...@@ -1576,7 +1576,7 @@ int ha_connect::ScanRecord(PGLOBAL g, uchar *buf) ...@@ -1576,7 +1576,7 @@ int ha_connect::ScanRecord(PGLOBAL g, uchar *buf)
uint cnv_errors; uint cnv_errors;
data_charset_value.copy(attribute.ptr(), attribute.length(), data_charset_value.copy(attribute.ptr(), attribute.length(),
attribute.charset(), charset, &cnv_errors); attribute.charset(), charset, &cnv_errors);
value->SetValue_psz(data_charset_value.c_ptr()); value->SetValue_psz(data_charset_value.c_ptr_safe());
} }
} // endswitch Type } // endswitch Type
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment