MDEV-33659 Server crashed at Create_func_aes_decrypt::create_native

mysql-test/main/func_str.result

@@ -5594,5 +5594,12 @@ aes_encrypt(a,a) is null
 1
 0
 #
+# MDEV-33659: Server crashed at Create_func_aes_decrypt::create_native
+#
+select aes_encrypt();
+ERROR 42000: Incorrect parameter count in the call to native function 'aes_encrypt'
+select aes_decrypt();
+ERROR 42000: Incorrect parameter count in the call to native function 'aes_decrypt'
+#
 # End of 11.2 tests
 #

mysql-test/main/func_str.test

@@ -2522,6 +2522,15 @@ set @@block_encryption_mode=default;
 --echo #
 select aes_encrypt(a,a) is null from (values('a'),(NULL),('b')) x;
 
+--echo #
+--echo # MDEV-33659: Server crashed at Create_func_aes_decrypt::create_native
+--echo #
+
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+select aes_encrypt();
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+select aes_decrypt();
+
 --echo #
 --echo # End of 11.2 tests
 --echo #

sql/item_create.cc

@@ -3167,8 +3167,12 @@ Item*
 Create_func_aes_encrypt::create_native(THD *thd, const LEX_CSTRING *name,
                                        List<Item> *item_list)
 {
-  uint arg_count= item_list->elements;
   Item *a[4];
+  uint arg_count= 0;
+
+  if (item_list != NULL)
+    arg_count= item_list->elements;
+
   for (uint i=0; i < MY_MIN(array_elements(a), arg_count); i++)
     a[i]= item_list->pop();
   switch (arg_count)
@@ -3191,8 +3195,12 @@ Item*
 Create_func_aes_decrypt::create_native(THD *thd, const LEX_CSTRING *name,
                                        List<Item> *item_list)
 {
-  uint arg_count= item_list->elements;
   Item *a[4];
+  uint arg_count= 0;
+
+  if (item_list != NULL)
+    arg_count= item_list->elements;
+
   for (uint i=0; i < MY_MIN(array_elements(a), arg_count); i++)
     a[i]= item_list->pop();
   switch (arg_count)