mirror of
https://github.com/moparisthebest/curl
synced 2025-02-28 09:21:50 -05:00
OOM handling fix
This commit is contained in:
parent
0f4a91afde
commit
71593dfe57
@ -461,15 +461,17 @@ CURLcode Curl_rtsp(struct connectdata *conn, bool *done)
|
||||
if(!Curl_checkheaders(data, "Content-Type:")) {
|
||||
result = Curl_add_bufferf(req_buffer,
|
||||
"Content-Type: text/parameters\r\n");
|
||||
if(result)
|
||||
return result;
|
||||
}
|
||||
if(result)
|
||||
return result;
|
||||
}
|
||||
|
||||
if(rtspreq == RTSPREQ_ANNOUNCE) {
|
||||
if(!Curl_checkheaders(data, "Content-Type:")) {
|
||||
result = Curl_add_bufferf(req_buffer,
|
||||
"Content-Type: application/sdp\r\n");
|
||||
if(result)
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
10
lib/url.c
10
lib/url.c
@ -4321,13 +4321,19 @@ static CURLcode set_userpass(struct connectdata *conn,
|
||||
!conn->bits.user_passwd) {
|
||||
|
||||
conn->user = strdup(CURL_DEFAULT_USER);
|
||||
conn->passwd = strdup(CURL_DEFAULT_PASSWORD);
|
||||
if(conn->user)
|
||||
conn->passwd = strdup(CURL_DEFAULT_PASSWORD);
|
||||
else
|
||||
conn->passwd = NULL;
|
||||
/* This is the default password, so DON'T set conn->bits.user_passwd */
|
||||
}
|
||||
else {
|
||||
/* store user + password, zero-length if not set */
|
||||
conn->user = strdup(user);
|
||||
conn->passwd = strdup(passwd);
|
||||
if(conn->user)
|
||||
conn->passwd = strdup(passwd);
|
||||
else
|
||||
conn->passwd = NULL;
|
||||
}
|
||||
if(!conn->user || !conn->passwd)
|
||||
return CURLE_OUT_OF_MEMORY;
|
||||
|
Loading…
x
Reference in New Issue
Block a user