Prevented access to uninitialized engines.

2 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5da2c167..4faa46fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-20  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
+
+	* src/scripting/script.cpp: Prevented access to uninitialized engines.
+
 2007-08-19  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/account-server/accounthandler.cpp, src/defines.h: Fixed typos.
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp
index 3e19305d..9666b213 100644
--- a/src/scripting/script.cpp
+++ b/src/scripting/script.cpp
@@ -47,13 +47,16 @@ void Script::registerEngine(std::string const &name, Factory f)
 
 Script *Script::create(std::string const &engine)
 {
-    Engines::const_iterator i = engines->find(engine);
-    if (i == engines->end())
+    if (engines)
     {
-        LOG_ERROR("No scripting engine named " << engine);
-        return NULL;
+        Engines::const_iterator i = engines->find(engine);
+        if (i != engines->end())
+        {
+            return i->second();
+        }
     }
-    return i->second();
+    LOG_ERROR("No scripting engine named " << engine);
+    return NULL;
 }
 
 void Script::update()