moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

HTTP2: Wrong NgHTTP2 user-data

Browse Source 
Something is wrong in 'userp' for the HTTP2 recv_callback().  The
session is created using bogus user-data; '&conn' and not 'conn'.

I noticed this since the socket-value in Curl_read_plain() was set to a
impossible high value.
This commit is contained in:
Gisle Vanem 2014-01-29 22:50:25 +01:00 committed by Daniel Stenberg
parent 220bcba93d
commit 0070f7a09d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/http2.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -111,12 +111,13 @@ static ssize_t recv_callback(nghttp2_session *h2,
{ {
struct connectdata *conn = (struct connectdata *)userp; struct connectdata *conn = (struct connectdata *)userp;
ssize_t nread; ssize_t nread;
CURLcode rc = Curl_read_plain(conn->sock[0], (char *)buf, length, &nread); CURLcode rc = Curl_read_plain(conn->sock[FIRSTSOCKET], (char *)buf, length,
&nread);
(void)h2; (void)h2;
(void)flags; (void)flags;
if(rc) { if(rc) {
failf(conn->data, "Failed recving HTTP2 data"); failf(conn->data, "Failed receiving HTTP2 data");
return NGHTTP2_ERR_CALLBACK_FAILURE; return NGHTTP2_ERR_CALLBACK_FAILURE;
} }
if(!nread) if(!nread)
@ -169,7 +170,7 @@ CURLcode Curl_http2_request(Curl_send_buffer *req,
if(!conn->proto.httpc.h2) { if(!conn->proto.httpc.h2) {
/* The nghttp2 session is not yet setup, do it */ /* The nghttp2 session is not yet setup, do it */
int rc = nghttp2_session_client_new(&conn->proto.httpc.h2, int rc = nghttp2_session_client_new(&conn->proto.httpc.h2,
&callbacks, &conn); &callbacks, conn);
if(rc) { if(rc) {
failf(conn->data, "Couldn't initialize nghttp2!"); failf(conn->data, "Couldn't initialize nghttp2!");
return CURLE_OUT_OF_MEMORY; /* most likely at least */ return CURLE_OUT_OF_MEMORY; /* most likely at least */