Changeset 3192 in orxonox.OLD

Timestamp:

Dec 16, 2004, 2:03:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/src/gui: segfault fix. Pointer was deleted that pointed somewhere we didn't know

File:

• orxonox/trunk/src/gui/orxonox_gui_gtk.cc (modified) (10 diffs)

orxonox/trunk/src/gui/orxonox_gui_gtk.cc

@@ -392 +392 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -512 +512 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -561 +561 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -640 +640 @@
 Image::Image (char* imagename)
 {
+  this->init();
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(imagename)+1];
   strcpy(label, imagename);
 
-  this->init();
 #ifdef HAVE_GTK2
   widget = gtk_image_new_from_file (imagename);
@@ -753 +753 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -806 +806 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -886 +886 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -978 +978 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(title)+1];
   strcpy(label, title);
@@ -1068 +1068 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char [strlen(title)+1];
   strcpy(label, title);
@@ -1125 +1125 @@
 {
   if (label)
-    delete label;
+    delete []label;
   label = new char[strlen(text)+1];
   strcpy(label, text);