Commit: 4e24f181b37cb89cefefdbb658024e2977206333 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• Revisión: 4e24f181b37cb89cefefdbb658024e2977206333 (tree)
• Tiempo: 2007-08-18 03:18:38
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Avoid a potential segmentation fault.

Cambiar Resumen

• modified: ChangeLog
• modified: mcmerge.c

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-08-17  Keith Marshall  <[e-mail]>
 
+	Avoid a potential segmentation fault.
+
+	* mcmerge.c (mc_merge): Don't blindly inspect data fields within
+	the `curr' message record; `curr' may be NULL, so test it first.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	* man/gencat.man (TH): Correct section; s/MAN3EXT/MAN1EXT/
 
 2007-08-16  Keith Marshall  <[e-mail]>

--- a/mcmerge.c
+++ b/mcmerge.c
@@ -10,7 +10,7 @@
  * any single source file into its current internal dictionary.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 12-May-2007
+ * Last modification: 17-Aug-2007
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -146,7 +146,7 @@ struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
 	  dfprintf(( stderr, "Initialise message list at set %u message %u\n", mark->set, mark->msg ));
 	}
       }
-      else if( curr->key == input->key )
+      else if( curr && (curr->key == input->key) )
       {
 	/* The input record refers to a message which is already present
 	 * in the current message list; the operation to be performed is
@@ -221,7 +221,7 @@ struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
 	  mark = input;
 	}
       }
-      else
+      else if( curr )
       {
 	/* There is no existing reference with set and message numbers
 	 * matching the current input record; thus the input record must
@@ -253,6 +253,16 @@ struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
 	dfprintf(( stderr, "before set %u message %u\n", curr->set, curr->msg ));
 	input->link = curr;
       }
+#     ifdef DEBUG
+      else
+      {
+	/* There is no `curr' record and the input record has not been
+	 * appended; this must be a delete request, with nothing to act on,
+	 * so we simply ignore it.
+	 */
+	dfprintf(( stderr, "Ignore delete request for non-existent message\n" ));
+      }
+#     endif
     }
 
     else if( input->set && (input->base == NULL) )
@@ -366,4 +376,4 @@ struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
   return cat;
 }
 
-/* $RCSfile$Revision: 1.2 $: end of file */
+/* $RCSfile$Revision: 1.3 $: end of file */