From dae6cb8b61f6c4864c428e94aaaf680de510041e Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 11 Aug 2016 22:11:38 +0200
Subject: [PATCH] Fix possible null pointer dereference

---
 src/output/cairo.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 1a8c78c69f..c7188af0b6 100644
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -1078,7 +1078,8 @@ xr_layout_cell_text (struct xr_driver *xr,
             {
               if (brk && clip[H][0] != clip[H][1])
                 best = bottom;
-              *brk = bottom;
+              if (brk)
+                *brk = bottom;
             }
           else
             break;
-- 
2.30.2