actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

string::find() result is a size_t, not an int

Browse Source 
unwrap conditional
return after error, or the output string will just be overwritten
This commit is contained in:
Glenn Maynard
2004-11-26 20:48:06 +00:00
parent 4d98c72902
commit 9c2d06e150
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenPackages.cpp
+23 -22
View File
@@ -598,30 +598,31 @@ void ScreenPackages::HTTPUpdate()
int HeaderEnd = m_sBUFFER.find("\n\n"); int HeaderEnd = m_sBUFFER.find("\n\n");
if( HeaderEnd == m_sBUFFER.npos ) if( HeaderEnd == m_sBUFFER.npos )
HeaderEnd = m_sBUFFER.find("\r\n\r\n"); HeaderEnd = m_sBUFFER.find("\r\n\r\n");
if( HeaderEnd != m_sBUFFER.npos ) if( HeaderEnd == m_sBUFFER.npos )
return;
size_t i = m_sBUFFER.find(" ");
size_t j = m_sBUFFER.find(" ",i+1);
size_t k = m_sBUFFER.find("\n",j+1);
if ( i == string::npos || j == string::npos || k == string::npos )
{ {
int i = m_sBUFFER.find(" "); m_iResponseCode = -100;
int j = m_sBUFFER.find(" ",i+1); m_sResponseName = "Malformed response.";
int k = m_sBUFFER.find("\n",j+1); return;
if ( i == string::npos || j == string::npos || k == string::npos )
{
m_iResponseCode = -100;
m_sResponseName = "Malformed response.";
}
m_iResponseCode = atoi(m_sBUFFER.substr(i+1,j-i).c_str());
m_sResponseName = m_sBUFFER.substr( j+1, k-j).c_str();
i = m_sBUFFER.find("Content-Length:");
j = m_sBUFFER.find("\n", i+1 );
if( i > 0 )
m_iTotalBytes = atoi(m_sBUFFER.substr(i+16,j-i).c_str());
else
m_iTotalBytes = -1; //We don't know, so go until disconnect
m_bGotHeader = true;
m_sBUFFER = m_sBUFFER.substr( HeaderEnd + 4 );
} }
m_iResponseCode = atoi(m_sBUFFER.substr(i+1,j-i).c_str());
m_sResponseName = m_sBUFFER.substr( j+1, k-j).c_str();
i = m_sBUFFER.find("Content-Length:");
j = m_sBUFFER.find("\n", i+1 );
if( i > 0 )
m_iTotalBytes = atoi(m_sBUFFER.substr(i+16,j-i).c_str());
else
m_iTotalBytes = -1; //We don't know, so go until disconnect
m_bGotHeader = true;
m_sBUFFER = m_sBUFFER.substr( HeaderEnd + 4 );
} }
else else
{ {