diff options
| author | Colin Snover | 2017-12-01 18:31:04 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-12-08 11:41:32 +0000 |
| commit | 257a99bdb8d933290c79464086aa3860f12dd1f6 (patch) | |
| tree | 2b29538e45227204f4d7a1ba69e4de4ae1c8e7fc | |
| parent | ff8a0311e37a5c254d2e1d3f895f7b2936319281 (diff) | |
| download | scummvm-rg350-257a99bdb8d933290c79464086aa3860f12dd1f6.tar.gz scummvm-rg350-257a99bdb8d933290c79464086aa3860f12dd1f6.tar.bz2 scummvm-rg350-257a99bdb8d933290c79464086aa3860f12dd1f6.zip | |
Revert "WAGE: Fix crashes for poorly initialized objects"
This reverts commit ea0fb987e042a86b8da683cafa7b9cf04d1636e6.
This issue was discovered during a full build of ScummVM using
Clang 5.
It is UB to call a null pointer. Whatever caller is trying to do
so needs to be fixed instead.
| -rw-r--r-- | engines/wage/entities.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wage/entities.h b/engines/wage/entities.h index a755af5360..0b5f96d37a 100644 --- a/engines/wage/entities.h +++ b/engines/wage/entities.h @@ -125,7 +125,7 @@ public: void setDesignBounds(Common::Rect *bounds); - Common::String toString() { if (!this) return "<NULL>"; return _name; } + Common::String toString() { return _name; } }; class Chr : public Designed { |