github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Code Releases Activity

- simpler http_response_append (uses realloc())

Browse Source 
- http_response_append addes extra 0 byte to close teh string
  (some functions like http_is_header_entire() use standard string
  functions like strstr which requires trailing zero)
- check for NULL string in http_is_header_entire()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7294 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-09-06 00:03:16 +00:00
parent 5f051af97e
commit 9954e006ae
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libmpdemux/http.c
View File

@ -45,31 +45,23 @@ http_free( HTTP_header_t *http_hdr ) {
int
http_response_append( HTTP_header_t *http_hdr, char *response, int length ) {
char *ptr = NULL;
char *ptr;
if( http_hdr==NULL || response==NULL || length<0 ) return -1;
ptr = (char*)malloc( http_hdr->buffer_size+length );
http_hdr->buffer = (char*)realloc( http_hdr->buffer, http_hdr->buffer_size+length+1 );
if( ptr==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory (re)allocation failed\n");
return -1;
}
if( http_hdr->buffer_size==0 ) {
// Buffer empty, copy response into it.
memcpy( ptr, response, length );
http_hdr->buffer_size = length;
} else {
// Buffer not empty, grow buffer, copy and append the response.
memcpy( ptr, http_hdr->buffer, http_hdr->buffer_size );
free( http_hdr->buffer );
memcpy( ptr+http_hdr->buffer_size, response, length );
http_hdr->buffer_size += length;
}
http_hdr->buffer = ptr;
memcpy( http_hdr->buffer+http_hdr->buffer_size, response, length );
http_hdr->buffer_size += length;
http_hdr->buffer[http_hdr->buffer_size]=0; // close the string!
return http_hdr->buffer_size;
}
int
http_is_header_entire( HTTP_header_t *http_hdr ) {
if( http_hdr==NULL ) return -1;
if( http_hdr->buffer==NULL ) return 0; // empty
if( strstr(http_hdr->buffer, "\r\n\r\n")==NULL &&
strstr(http_hdr->buffer, "\n\n")==NULL ) return 0;