From c9bd05a97790e4c1e2618df8255452019833c1d0 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 12 Dec 2016 14:45:26 +1300
Subject: [PATCH] Database::check(): Fix SEGV when out==NULL and opts!=0

(cherry picked from commit f50c728f59ffcae2ba91311a9a7298640ccba9af)
---
 xapian-core/backends/glass/glass_check.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xapian-core/backends/glass/glass_check.cc b/xapian-core/backends/glass/glass_check.cc
index 9d5717273..9c2ef4952 100644
--- a/xapian-core/backends/glass/glass_check.cc
+++ b/xapian-core/backends/glass/glass_check.cc
@@ -354,7 +354,7 @@ GlassTableCheck::check(const char * tablename, const string & path, int fd,
 	    throw Xapian::DatabaseError(e);
 	}
     }
-    if (opts) *out << "B-tree checked okay" << endl;
+    if (out && opts) *out << "B-tree checked okay" << endl;
     return B.release();
 }
 
-- 
2.11.4.GIT