gerrit.automotivelinux Code Review - AGL/meta-agl.git/blob

   1 From: jose.bollo@iot.bzh
   2 Date: Thu, 4 May 2017 21:47:38 +0200
   3 Subject: [PATCH] Check response existence on upgrade
   4 MIME-Version: 1.0
   5 Content-Type: text/plain; charset=UTF-8
   6 Content-Transfer-Encoding: 8bit
   7
   8 When a connection upgrade is requested and when the
   9 request sent an error reply, the response is most of
  10 the time already sent when the test on
  11 connection->response->upgrade_handler is made, leading
  12 to dereferencing NULL.
  13
  14 Two possibilities exist:
  15
  16   NULL == connection->response || NULL == connection->response->upgrade_handler
  17
  18 or
  19
  20   NULL != connection->response && NULL == connection->response->upgrade_handler
  21
  22 The first is prefered because it is probably safer to close the connection
  23 in that case.
  24
  25 Upstream-Status: Accepted [https://gnunet.org/git/libmicrohttpd.git/commit/?id=b4216c60fdb5b48f6cfec416301fc63a1167e6cd]
  26
  27 Change-Id: Ie6e7fc165f7fe3635ade0952bb34a0b937d38716
  28 Signed-off-by: José Bollo <jobol@nonadev.net>
  29 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
  30 ---
  31  src/microhttpd/connection.c | 2 +-
  32  1 file changed, 1 insertion(+), 1 deletion(-)
  33
  34 diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
  35 index 4753d6e..91a4492 100644
  36 --- a/src/microhttpd/connection.c
  37 +++ b/src/microhttpd/connection.c
  38 @@ -882,7 +882,7 @@ keepalive_possible (struct MHD_Connection *connection)
  39  #ifdef UPGRADE_SUPPORT
  40      if ( (MHD_str_equal_caseless_ (end,
  41                                     "upgrade")) &&
  42 -         (NULL == connection->response->upgrade_handler) )
  43 +         (NULL == connection->response || NULL == connection->response->upgrade_handler) )
  44        return MHD_NO;
  45  #endif /* UPGRADE_SUPPORT */
  46
  47 --
  48 2.9.3
  49