From ec383d59fac0e3f7ee86e35ec77720a625df2f28 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon, 30 May 2016 17:50:59 +0000
Subject: [PATCH] check mysql->extension for NULL before referencing it

---
 libmariadb/mariadb_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index e3d89a81..45d1821c 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -1846,7 +1846,7 @@ mysql_close(MYSQL *mysql)
 {
   if (mysql)					/* Some simple safety */
   {
-    if (mysql->extension->conn_hdlr)
+    if ((mysql->extension && mysql->extension->conn_hdlr)
     {
       MA_CONNECTION_HANDLER *p= mysql->extension->conn_hdlr;
       p->plugin->close(mysql);