Fixed use of uninitialized Control.

1 files changed, 13 insertions, 11 deletions

diff --git a/src/shared/cplusplus/Control.cpp b/src/shared/cplusplus/Control.cpp
index fee0ee3d94..249d671ae1 100644
--- a/src/shared/cplusplus/Control.cpp
+++ b/src/shared/cplusplus/Control.cpp
@@ -89,16 +89,7 @@ public:
         : control(control),
           translationUnit(0),
           diagnosticClient(0)
-    {
-        objcGetterId = control->findOrInsertIdentifier("getter");
-        objcSetterId = control->findOrInsertIdentifier("setter");
-        objcReadwriteId = control->findOrInsertIdentifier("readwrite");
-        objcReadonlyId = control->findOrInsertIdentifier("readonly");
-        objcAssignId = control->findOrInsertIdentifier("assign");
-        objcRetainId = control->findOrInsertIdentifier("retain");
-        objcCopyId = control->findOrInsertIdentifier("copy");
-        objcNonatomicId = control->findOrInsertIdentifier("nonatomic");
-    }
+    {}
 
     ~Data()
     {
@@ -599,7 +590,18 @@ public:
 };
 
 Control::Control()
-{ d = new Data(this); }
+{
+    d = new Data(this);
+
+    d->objcGetterId = findOrInsertIdentifier("getter");
+    d->objcSetterId = findOrInsertIdentifier("setter");
+    d->objcReadwriteId = findOrInsertIdentifier("readwrite");
+    d->objcReadonlyId = findOrInsertIdentifier("readonly");
+    d->objcAssignId = findOrInsertIdentifier("assign");
+    d->objcRetainId = findOrInsertIdentifier("retain");
+    d->objcCopyId = findOrInsertIdentifier("copy");
+    d->objcNonatomicId = findOrInsertIdentifier("nonatomic");
+}
 
 Control::~Control()
 { delete d; }