summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Hurlbut <ghurlbut@mythtv.org>2011-05-28 02:30:43 (GMT)
committer Gavin Hurlbut <ghurlbut@mythtv.org>2011-05-28 02:39:21 (GMT)
commitc321ee6a821f2a773f0d8d158d27d83b70c9332d (patch)
tree031ce7d49b1a1213fbc025ddb62160074eea1771
parent9375ffb6e7b016c2d80942f25a64e86758e280eb (diff)
Initialize the MythUIImage filename correctly
Fixes #9634. Fixes #9708. Refs #9547. If the filename does not start with "/", "http://", "https://" or "ftp://", then the actual filename loaded is uninitialized. It can be any random crap on the stack. I'm honestly surprised this worked at all :) This may fix things for #9547 as well, and should be tested with that scenario too. (cherry picked from commit 2c7735e7f80b5d2737d2bc8c4e9144f3e42da2e7)
-rw-r--r--mythtv/libs/libmythui/mythuiimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/libs/libmythui/mythuiimage.cpp b/mythtv/libs/libmythui/mythuiimage.cpp
index c3c3667..239dc80 100644
--- a/mythtv/libs/libmythui/mythuiimage.cpp
+++ b/mythtv/libs/libmythui/mythuiimage.cpp
@@ -84,7 +84,7 @@ class ImageLoadThread : public QRunnable
void run()
{
- QString tmpFilename;
+ QString tmpFilename = m_filename;
if ((m_filename.startsWith("/")) ||
(m_filename.startsWith("http://")) ||
(m_filename.startsWith("https://")) ||