From 2a4781789612c6c53cbe12c1426f93b15737a148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <cvicentiu@gmail.com>
Date: Sun, 14 Feb 2016 18:33:20 +0200
Subject: [PATCH] MDEV-9225 mysql_upgrade segfault due to missing /etc/my.cnf.d

In case of missing includedir file, we would attempt to free a NULL
pointer. Make sure to guard against that.
---
 client/mysql_upgrade.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index bc9b3c5b149..8cfdac5b69a 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -182,7 +182,8 @@ static const char *load_default_groups[]=
 static void free_used_memory(void)
 {
   /* Free memory allocated by 'load_defaults' */
-  free_defaults(defaults_argv);
+  if (defaults_argv)
+    free_defaults(defaults_argv);
 
   dynstr_free(&ds_args);
   dynstr_free(&conn_args);