mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-18 22:07:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve scope of buffer_len

Browse Source
This commit is contained in:
Isaac Connor
2021-04-20 16:38:42 -04:00
parent d86fc9fdd6
commit da3a302ddd
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zm_remote_camera_http.cpp
View File

@@ -310,7 +310,6 @@ int RemoteCameraHttp::GetData() {
}
int RemoteCameraHttp::GetResponse() {
int buffer_len;
#if HAVE_LIBPCRE
if ( method == REGEXP ) {
const char *header = nullptr;
@@ -331,7 +330,7 @@ int RemoteCameraHttp::GetResponse() {
switch( state ) {
case HEADER :
{
buffer_len = GetData();
int buffer_len = GetData();
if ( buffer_len < 0 ) {
Error("Unable to read header data");
return -1;
@@ -471,7 +470,7 @@ int RemoteCameraHttp::GetResponse() {
state = CONTENT;
} else {
Debug( 3, "Unable to extract subheader from stream, retrying" );
buffer_len = GetData();
int buffer_len = GetData();
if ( buffer_len < 0 ) {
Error( "Unable to extract subheader data" );
return( -1 );
@@ -514,7 +513,7 @@ int RemoteCameraHttp::GetResponse() {
Debug(3, "Got end of image by length, content-length = %d", content_length);
} else {
while (!content_length) {
buffer_len = GetData();
int buffer_len = GetData();
if (buffer_len < 0) {
Error("Unable to read content");
return -1;
@@ -620,7 +619,7 @@ int RemoteCameraHttp::GetResponse() {
FALLTHROUGH;
case HEADERCONT :
{
buffer_len = GetData();
int buffer_len = GetData();
if (buffer_len < 0) {
Error("Unable to read header");
return -1;
@@ -923,7 +922,7 @@ int RemoteCameraHttp::GetResponse() {
state = CONTENT;
} else {
Debug(3, "Unable to extract subheader from stream, retrying");
buffer_len = GetData();
int buffer_len = GetData();
if (buffer_len < 0) {
Error("Unable to read subheader");
return -1;
@@ -974,7 +973,7 @@ int RemoteCameraHttp::GetResponse() {
// Read until we find the end of image or the stream closes.
while (!content_length && !zm_terminate) {
Debug(4, "!content_length, ReadData");
buffer_len = ReadData(buffer);
int buffer_len = ReadData(buffer);
if (buffer_len < 0) {
Error("Unable to read content");
return -1;