Fix coredump if mysql is not in slave mode and slave status is requested.

* src/nssync.c (check_slave_status): Return if no status file is defined,
or if sql_get_slave_status returned 1
(main): Call check_slave_status unconditionally. It will take care of
the rest.
* src/sqlop.c (sql_get_slave_status): Fail if any of file or off is NULL.

2 files changed, 14 insertions, 6 deletions

diff --git a/src/nssync.c b/src/nssync.c
index 75de83c..3eb5540 100644
--- a/src/nssync.c
+++ b/src/nssync.c
@@ -306,33 +306,40 @@ synchronize(struct nssync *sp)
 	free(sp->temp_file_name);
 }
 
 void
 check_slave_status()
 {
-	FILE *fp = fopen(slave_status_file, "r");
+	FILE *fp;
 	char *saved_file = NULL;
 	char *saved_off;
 	char *buf = NULL;
 	size_t size = 0;
 	char *sql_file, *sql_off;
+
+	if (!slave_status_file)
+		return;
 	
+        if (sql_get_slave_status(&sql_file, &sql_off)) {
+                unlink(slave_status_file);
+                return;
+        }
+
+	fp = fopen(slave_status_file, "r");
 	if (fp) {
 		if (grecs_getline(&buf, &size, fp) > 0) {
 			buf[strlen(buf)-1] = 0;
 			saved_file = buf;
 			saved_off = strchr(saved_file, ' ');
 			if (saved_off)
 				*saved_off++ = 0;
 		}
 		fclose(fp);
 	}
 
-	if (sql_get_slave_status(&sql_file, &sql_off)) 
-		unlink(slave_status_file);
-	else if (!force && saved_file && saved_off &&
+	if (!force && saved_file && saved_off &&
 		 strcmp(sql_file, saved_file) == 0 &&
 		 strcmp(sql_off, saved_off) == 0) {
 		debug(1, ("slave status hasn't changed: nothing to do"));
 		exit(0);
 	}
 	fp = fopen(slave_status_file, "w");
@@ -426,14 +433,13 @@ main(int argc, char **argv)
 		     EX_CONFIG : 0);
 	config_parse();
 	sql_connect();
 
 	check_pidfile();
 	
-	if (slave_status_file)
-		check_slave_status();
+	check_slave_status();
 	
 	for (ep = synclist->head; ep; ep = ep->next)
 		synchronize(ep->data);
 
 	if (error_count) {
 		error("exiting due to errors");
diff --git a/src/sqlop.c b/src/sqlop.c
index db53c45..00f4bc6 100644
--- a/src/sqlop.c
+++ b/src/sqlop.c
@@ -110,12 +110,14 @@ read_slave_status(MYSQL_ROW row, unsigned nf, void *closure)
 int
 sql_get_slave_status(char **pfile, char **poff)
 {
 	struct slave_status_info ssi = { NULL, NULL };
 	if (sql_do_query("SHOW SLAVE STATUS", read_slave_status, &ssi))
 		return 1;
+	if (!ssi.file || !ssi.off)
+		return 1;
 	*pfile = ssi.file;
 	*poff = ssi.off;
 	return 0;
 }