From a43c8c6e936b14bce762338b1c818771fd6fbe47 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 Feb 2015 08:36:47 -0500
Subject: [PATCH] Merged #239 "Remote Leakage Of Shared Buffers In Jetty Web Server [CVE-2015-2080]"

---
 src/main/java/com/gitblit/tickets/TicketNotifier.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 07371b1..d6217b3 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -596,7 +596,7 @@
 
 		// respect the author's email preference
 		UserModel lastAuthor = userManager.getUserModel(lastChange.author);
-		if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
+		if (lastAuthor != null && !lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
 			toAddresses.remove(lastAuthor.emailAddress);
 			ccAddresses.remove(lastAuthor.emailAddress);
 		}

--
Gitblit v1.9.1