]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 733342a)
dirty fix for even dirtier memory leak
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 24 Mar 2002 15:50:57 +0000 (15:50 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 24 Mar 2002 15:50:57 +0000 (15:50 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/html/virtual/virtual.cpp patch | blob | blame | history

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index 8672b7b277efcae8cb9f7686f60baa658b5e91f7..a34298dc023d73f5cbe8a3794e5de90c64251b05 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -54,7 +54,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& fs, const wxString& location)
 {
     wxFSFile *f;
     wxInputStream *str;
 {
     wxFSFile *f;
     wxInputStream *str;
-    char *buf = (char*)malloc(1024);
+    static char buf[1024];
 
     sprintf(buf, "<html><body><h2><i>You're in Node <u>%s</u></i></h2><p>"
                  "Where do you want to go?<br><blockquote>"
 
     sprintf(buf, "<html><body><h2><i>You're in Node <u>%s</u></i></h2><p>"
                  "Where do you want to go?<br><blockquote>"
@@ -64,10 +64,14 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& fs, const wxString& location)
                  "</blockquote></body></html>",
                  location.GetData(), location.GetData(), location.GetData(), location.GetData());
 
                  "</blockquote></body></html>",
                  location.GetData(), location.GetData(), location.GetData(), location.GetData());
 
-    // WARNING: wxMemoryInputStream will not free buf.
-    // There is a memory leak here.
+    // NB: There's a terrible hack involved: we fill 'buf' with new data every
+    //     time this method is called and return new wxMemoryInputStream pointing to it.
+    //     This won't work as soon as there are 2+ myVFS files opened. Fortunately,
+    //     this won't happen because wxHTML keeps only one "page" file opened at the
+    //     time.
     str = new wxMemoryInputStream(buf, strlen(buf));
     f = new wxFSFile(str, location, "text/html", wxEmptyString, wxDateTime::Today());
     str = new wxMemoryInputStream(buf, strlen(buf));
     f = new wxFSFile(str, location, "text/html", wxEmptyString, wxDateTime::Today());
+    
     return f;
 }
 
     return f;
 }
 
wxWidgets (Impactor)