diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-28 16:57:03 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-28 16:57:03 +0200 |
| commit | 2d8c575584b43125a44d6f08aecaed3d7bf8046e (patch) | |
| tree | eff9f21bb8d1cad12974a6caca1ec8f3b49d3234 /sql | |
| parent | 691d4b31084d5f2bce52712d88dd4e9b16cb6bfb (diff) | |
| download | mariadb-git-2d8c575584b43125a44d6f08aecaed3d7bf8046e.tar.gz | |
Fixing crashing bugs as reported in bugs database
#195
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 | ||||
| -rw-r--r-- | sql/item_strfunc.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 4d2aaf5a0f2..09f0aeefb09 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -769,7 +769,8 @@ Item_func_if::val_str(String *str) { Item *arg= args[0]->val_int() ? args[1] : args[2]; String *res=arg->val_str(str); - res->set_charset(charset()); + if (res) + res->set_charset(charset()); null_value=arg->null_value; return res; } diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 07b7eb2d165..e403b970fe1 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -512,7 +512,8 @@ public: { String *tmp=args[0]->val_str(a); null_value=args[0]->null_value; - tmp->set_charset(&my_charset_bin); + if (tmp) + tmp->set_charset(&my_charset_bin); return tmp; } void fix_length_and_dec() |