Fixed|Particles: Out-of-bounds memory access

Apparently spinIndex was sometimes incorrectly calculated on p_particle.cpp:794.
skyjake · Jan 13, 2014 · e2ebe9f · e2ebe9f
1 parent 7a339f5
commit e2ebe9f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/doomsday/client/src/world/p_particle.cpp b/doomsday/client/src/world/p_particle.cpp
@@ -791,7 +791,9 @@ void Generator::spinParticle(ParticleInfo &pinfo)
     static int const pitchSigns[4] = { 1, -1,  1, -1 };
 
     ded_ptcstage_t const *stDef = &def->stages[pinfo.stage];
-    uint const spinIndex        = (&pinfo - &_pinfo[id() / 8]) % 4;
+    uint const spinIndex        = uint(&pinfo - &_pinfo[id() / 8]) % 4;
+
+    DENG_ASSERT(spinIndex < 4);
 
     int const yawSign   =   yawSigns[spinIndex];
     int const pitchSign = pitchSigns[spinIndex];

diff --git a/doomsday/libappfw/include/de/widgets/commandwidget.h b/doomsday/libappfw/include/de/widgets/commandwidget.h
@@ -79,7 +79,7 @@ public slots:
 signals:
     void gotFocus();
     void lostFocus();
-    void commandEntered(String const &command);
+    void commandEntered(de::String const &command);
 
 private:
     DENG2_PRIVATE(d)

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -1167,7 +1167,7 @@ static void printMapBanner(void)
 #else
         dd_snprintf(buf, 64, "Map %u: " DE2_ESC(b) "%s", gameMap+1, name);
 #endif
-        App_Log(DE2_LOG_MAP, "%s", buf);
+        App_Log(DE2_MAP_NOTE, "%s", buf);
     }
 
 #if !__JHEXEN__