summaryrefslogtreecommitdiffstats
path: root/src/resourcemgr.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-01-02 08:56:45 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-01-02 09:45:18 (GMT)
commit312bef563a5be72f6423377247db1b80044bf711 (patch)
tree3a656445fa67469b2f1783932fe127e9f39af69a /src/resourcemgr.cpp
parented39dab59f8af2c5b42cfac0b3140cf594412121 (diff)
downloadDoxygen-312bef563a5be72f6423377247db1b80044bf711.zip
Doxygen-312bef563a5be72f6423377247db1b80044bf711.tar.gz
Doxygen-312bef563a5be72f6423377247db1b80044bf711.tar.bz2
Fixed a couple of cases where sharing string data could lead to corruption
Also made dangerous string access more visible by introducing rawData(). This replaces data() which will now return a constant string.
Diffstat (limited to 'src/resourcemgr.cpp')
-rw-r--r--src/resourcemgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resourcemgr.cpp b/src/resourcemgr.cpp
index a15a702..4b504e4 100644
--- a/src/resourcemgr.cpp
+++ b/src/resourcemgr.cpp
@@ -132,7 +132,7 @@ bool ResourceMgr::copyResourceAs(const char *name,const char *targetDir,const ch
if (f.open(IO_WriteOnly))
{
QCString buf(res->size+1);
- memcpy(buf.data(),res->data,res->size);
+ memcpy(buf.rawData(),res->data,res->size);
FTextStream t(&f);
buf = replaceColorMarkers(buf);
if (qstrcmp(name,"navtree.css")==0)
@@ -172,7 +172,7 @@ QCString ResourceMgr::getAsString(const char *name) const
if (res)
{
QCString result(res->size+1);
- memcpy(result.data(),res->data,res->size);
+ memcpy(result.rawData(),res->data,res->size);
return result;
}
else