aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2013-10-28 14:26:34 -0700
committerjmarshallnz <jcmarsha@gmail.com>2013-10-28 14:26:34 -0700
commit36b0c85a1f426dec55ef9ebdcee377a7866fe9b3 (patch)
treea27d76eeeb09fd1ebcc0e7f38839f285df0e4f5f
parente0ad223a3e0c078aa02366b2cee8420a7d670f43 (diff)
parent774e6354bbcda87e776369662f14c53c273feb1d (diff)
Merge pull request #3514 from Karlson2k/scraperurl_fix_01
ScraperUrl::Get: fix: avoid race conditions
-rw-r--r--xbmc/utils/ScraperUrl.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/xbmc/utils/ScraperUrl.cpp b/xbmc/utils/ScraperUrl.cpp
index 470d18aeda..d9c38ccad6 100644
--- a/xbmc/utils/ScraperUrl.cpp
+++ b/xbmc/utils/ScraperUrl.cpp
@@ -214,10 +214,9 @@ bool CScraperUrl::Get(const SUrlEntry& scrURL, std::string& strHTML, XFILE::CCur
XFILE::CFile file;
if (file.Open(strCachePath))
{
- char* temp = new char[(int)file.GetLength()];
- file.Read(temp,file.GetLength());
- strHTML.clear();
- strHTML.append(temp,temp+file.GetLength());
+ size_t flen = file.GetLength();
+ char* temp = new char[flen];
+ strHTML.assign(temp, file.Read(temp, flen));
file.Close();
delete[] temp;
return true;