Commit: d957741a049b565f3928c15405242c30c947ff54 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: d957741a049b565f3928c15405242c30c947ff54 (tree)
• Time: 2012-10-18 22:08:05
• Author: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Fix Diagnostic Message Handler initialisation logic.

Change Summary

• modified: ChangeLog
• modified: src/dmh.cpp

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Fix Diagnostic Message Handler initialisation logic.
+
+	* src/dmh.cpp (dmh_init) [DMH_SUBSYSTEM_GUI]: Correct a logic error;
+	it previously fell through after any successful initialisation of the
+	DMH_SUBSYSTEM_GUI handler, replacing it with a DMH_SUBSYSTEM_TTY type
+	handler.  Also, assign a heap copy of the passed "progname" string
+	resource, which is volatile, to ensure that the handler retains a
+	valid reference.
+
 2012-10-11  Keith Marshall  <[e-mail]>
 
 	Implement preliminary GUI mode data sheet compiler.

--- a/src/dmh.cpp
+++ b/src/dmh.cpp
@@ -104,16 +104,17 @@ EXTERN_C void dmh_init( const dmh_class subsystem, const char *progname )
     /* No message handler has yet been initialised;
      * passing the specified program name, select...
      */
-    if( (subsystem == DMH_SUBSYSTEM_GUI)
+    if( subsystem == DMH_SUBSYSTEM_GUI )
+    {
       /*
        * ...a GUI class handler on demand...
        */
-    && ((dmh = dmh_init_gui( progname )) == NULL) )
-      /*
-       * ...but bail out, if this cannot be initialised...
-       */
-      throw dmh_exception( "DMH subsystem initialisation failed" );
-
+      if( (dmh = dmh_init_gui( strdup( progname ))) == NULL )
+	/*
+	 * ...but bail out, if this cannot be initialised...
+	 */
+	throw dmh_exception( "DMH subsystem initialisation failed" );
+    }
     else
       /* ...otherwise, a console class handler by default.
        */