summaryrefslogtreecommitdiff
path: root/sql/protocol_cursor.cc
diff options
context:
space:
mode:
authorpem@mysql.comhem.se <>2004-09-10 16:28:11 +0200
committerpem@mysql.comhem.se <>2004-09-10 16:28:11 +0200
commit728000b22514f97cca66126c6f9e86a5ce7a0d61 (patch)
treeff8b7de4aa2beb41f5797fa160bf00b13fd14840 /sql/protocol_cursor.cc
parent4cb65274213e4cc844c7c92936e41c0a33188c0d (diff)
downloadmariadb-git-728000b22514f97cca66126c6f9e86a5ce7a0d61.tar.gz
Fixed BUG#4941: Stored procedure crash fetching null value into variable.
Diffstat (limited to 'sql/protocol_cursor.cc')
-rw-r--r--sql/protocol_cursor.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/protocol_cursor.cc b/sql/protocol_cursor.cc
index 31eaa894045..8904aba7b88 100644
--- a/sql/protocol_cursor.cc
+++ b/sql/protocol_cursor.cc
@@ -112,7 +112,8 @@ bool Protocol_cursor::write()
for (; cur_field < fields_end; ++cur_field, ++data_tmp)
{
- if ((len= net_field_length((uchar **)&cp)) == 0)
+ if ((len= net_field_length((uchar **)&cp)) == 0 ||
+ len == NULL_LENGTH)
{
*data_tmp= 0;
}