Fixed: Various cases of undefined behavior

Notably, taskBarBlur must be available before other widgets.
skyjake · Oct 29, 2018 · c7ab163 · c7ab163
1 parent 62ccd35
commit c7ab163
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 16 deletions.
diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp
@@ -179,6 +179,10 @@ DENG2_PIMPL(ClientWindow)
     {
         Style &style = ClientApp::windowSystem().style();
 
+        // This is a shared widget so it may be accessed during initialization of other widgets;
+        // create it first.
+        taskBarBlur = new LabelWidget("taskbar-blur");
+
         gameWidth ->set(root.viewWidth());
         gameHeight->set(root.viewHeight());
 
@@ -293,10 +297,8 @@ DENG2_PIMPL(ClientWindow)
         fsBusy->useMiniStyle();
         fsBusy->setText("Files");
         fsBusy->setTextAlignment(ui::AlignRight);
-        FS::get().audienceForBusy() += this;
 
         // Everything behind the task bar can be blurred with this widget.
-        taskBarBlur = new LabelWidget("taskbar-blur");
         if (style.isBlurringAllowed())
         {
             taskBarBlur->set(GuiWidget::Background(Vector4f(1, 1, 1, 1), GuiWidget::Background::Blurred));
@@ -393,6 +395,7 @@ DENG2_PIMPL(ClientWindow)
             taskBar->close();
         }
 
+        FS::get().audienceForBusy() += this;
         Loop::get().timer(1.0, [this] () { showOrHideQuitButton(); });
     }
 

diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/file.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/file.h
@@ -76,7 +76,7 @@ class LIBDOOMSDAY_PUBLIC File1
      * @param _info         Info descriptor for the file. A copy is made.
      * @param container     Container of this file. Can be @c NULL.
      */
-    File1(FileHandle &hndl, String _path, FileInfo const &_info, File1 *container = 0);
+    File1(FileHandle *hndl, String _path, FileInfo const &_info, File1 *container = 0);
 
     /**
      * Release all memory acquired for objects linked with this resource.

diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/wad.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/wad.h
@@ -57,7 +57,7 @@ class LIBDOOMSDAY_PUBLIC Wad : public File1, public LumpIndex
     class LumpFile : public File1
     {
     public:
-        LumpFile(Entry &entry, FileHandle &hndl, String path, FileInfo const &info,
+        LumpFile(Entry &entry, FileHandle *hndl, String path, FileInfo const &info,
                  File1 *container);
 
         /// @return  Name of this file.

diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/zip.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/zip.h
@@ -59,7 +59,7 @@ class LIBDOOMSDAY_PUBLIC Zip : public File1, public LumpIndex
     class LumpFile : public File1
     {
     public:
-        LumpFile(Entry &entry, FileHandle &hndl, String path, FileInfo const &info,
+        LumpFile(Entry &entry, FileHandle *hndl, String path, FileInfo const &info,
                  File1 *container);
 
         /// @return  Name of this file.

diff --git a/doomsday/apps/libdoomsday/src/filesys/file.cpp b/doomsday/apps/libdoomsday/src/filesys/file.cpp
@@ -28,8 +28,8 @@
 
 namespace de {
 
-File1::File1(FileHandle &hndl, String _path, FileInfo const &_info, File1 *_container)
-    : handle_(&hndl)
+File1::File1(FileHandle *hndl, String _path, FileInfo const &_info, File1 *_container)
+    : handle_(hndl)
     , info_(_info)
     , container_(_container)
     , flags(DefaultFlags)

diff --git a/doomsday/apps/libdoomsday/src/filesys/wad.cpp b/doomsday/apps/libdoomsday/src/filesys/wad.cpp
@@ -126,7 +126,7 @@ static QString Wad_invalidIndexMessage(int invalidIdx, int lastValidIdx)
 
 using namespace internal;
 
-Wad::LumpFile::LumpFile(Entry &entry, FileHandle &hndl, String path,
+Wad::LumpFile::LumpFile(Entry &entry, FileHandle *hndl, String path,
     FileInfo const &info, File1 *container)
     : File1(hndl, path, info, container)
     , entry(entry)
@@ -182,7 +182,7 @@ DENG2_PIMPL_NOREF(Wad)
 };
 
 Wad::Wad(FileHandle &hndl, String path, FileInfo const &info, File1 *container)
-    : File1(hndl, path, info, container)
+    : File1(&hndl, path, info, container)
     , LumpIndex()
     , d(new Impl)
 {
@@ -212,8 +212,7 @@ Wad::Wad(FileHandle &hndl, String path, FileInfo const &info, File1 *container)
         entry.offset = lump.offset;
         entry.size   = lump.size;
 
-        FileHandle *dummy = 0; /// @todo Fixme!
-        LumpFile *lumpFile = new LumpFile(entry, *dummy, entry.path(),
+        LumpFile *lumpFile = new LumpFile(entry, nullptr, entry.path(),
                                           FileInfo(lastModified(), // Inherited from the container (note recursion).
                                                    i, entry.offset, entry.size, entry.size),
                                           this);

diff --git a/doomsday/apps/libdoomsday/src/filesys/zip.cpp b/doomsday/apps/libdoomsday/src/filesys/zip.cpp
@@ -269,7 +269,7 @@ static bool applyGamePathMappings(String &path)
 
 using namespace internal;
 
-Zip::LumpFile::LumpFile(Entry &entry, FileHandle &hndl, String path,
+Zip::LumpFile::LumpFile(Entry &entry, FileHandle *hndl, String path,
     FileInfo const &info, File1 *container)
     : File1(hndl, path, info, container)
     , entry(entry)
@@ -361,7 +361,7 @@ DENG2_PIMPL(Zip)
 };
 
 Zip::Zip(FileHandle &hndl, String path, FileInfo const &info, File1 *container)
-    : File1(hndl, path, info, container)
+    : File1(&hndl, path, info, container)
     , LumpIndex(true/*paths are unique*/)
     , d(new Impl(this))
 {
@@ -510,8 +510,7 @@ Zip::Zip(FileHandle &hndl, String path, FileInfo const &info, File1 *container)
             entry.size           = DD_ULONG(header->size);
             entry.compressedSize = compressedSize;
 
-            FileHandle *dummy = 0; /// @todo Fixme!
-            LumpFile *lumpFile = new LumpFile(entry, *dummy, entry.path(),
+            LumpFile *lumpFile = new LumpFile(entry, nullptr, entry.path(),
                                               FileInfo(lastModified(), // Inherited from the file (note recursion).
                                               lumpIdx, entry.offset, entry.size, entry.compressedSize),
                                               this);

diff --git a/doomsday/sdk/libcore/src/core/loop.cpp b/doomsday/sdk/libcore/src/core/loop.cpp
@@ -64,6 +64,10 @@ Loop::Loop() : d(new Impl(this))
 
 void Loop::setRate(double freqHz)
 {
+    if (fequal(freqHz, 0.0))
+    {
+        freqHz = 120.0;
+    }
     d->interval = 1.0 / freqHz;
     d->timer->setInterval(de::max(1, int(d->interval.asMilliSeconds())));
 }

diff --git a/doomsday/sdk/libcore/src/data/value.cpp b/doomsday/sdk/libcore/src/data/value.cpp
@@ -61,7 +61,12 @@ Value::Number Value::asSafeNumber(Number const &defaultValue) const
 
 int Value::asInt() const
 {
-    return round<int>(asNumber());
+    const double num = asNumber();
+    if (num > std::numeric_limits<int>::max())
+    {
+        return std::numeric_limits<int>::max();
+    }
+    return round<int>(num);
 }
 
 StringList Value::asStringList() const

diff --git a/doomsday/sdk/libgui/src/guiapp.cpp b/doomsday/sdk/libgui/src/guiapp.cpp
@@ -41,6 +41,7 @@ DENG2_PIMPL(GuiApp)
 
     Impl(Public *i) : Base(i)
     {
+        loop.setRate(120);
         loop.audienceForIteration() += self();
 
         // The default render thread is the main thread.