From: Stefan Eissing <icing@apache.org>
Date: Mon, 26 Oct 2015 13:48:13 +0000 (+0000)
Subject: fix for null connection states
X-Git-Tag: 2.5.0-alpha~2687
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f2ff0cd842c07ed0bea579296315bb7b902581d;p=thirdparty%2Fapache%2Fhttpd.git

fix for null connection states

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710597 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
index 816801c3361..b246f87a319 100644
--- a/modules/http2/h2_conn.c
+++ b/modules/http2/h2_conn.c
@@ -283,11 +283,15 @@ static apr_status_t h2_conn_loop(h2_session *session)
          */
         got_streams = !h2_stream_set_is_empty(session->streams);
         if (!got_streams || session->frames_received <= 1) {
-            session->c->cs->state = CONN_STATE_WRITE_COMPLETION;
+            if (session->c->cs) {
+                session->c->cs->state = CONN_STATE_WRITE_COMPLETION;
+            }
             status = h2_session_read(session, APR_BLOCK_READ);
         }
         else {
-            session->c->cs->state = CONN_STATE_HANDLER;
+            if (session->c->cs) {
+                session->c->cs->state = CONN_STATE_HANDLER;
+            }
             status = h2_session_read(session, APR_NONBLOCK_READ);
         }