ncurses 5.9 - patch 20140323

[ncurses.git] / form / fty_regex.c

diff --git a/form/fty_regex.c b/form/fty_regex.c
index 2a95c126a5197009cae778b4bda9a1210f32bc13..7a42e7eee7f00b8d6b2c24a346b73606b2c8c0f8 100644 (file)
--- a/form/fty_regex.c
+++ b/form/fty_regex.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -34,7 +34,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_regex.c,v 1.23 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_regex.c,v 1.25 2012/10/27 20:12:53 tom Exp $")
 
 #if HAVE_REGEX_H_FUNCS         /* We prefer POSIX regex */
 #include <regex.h>
@@ -117,15 +117,14 @@ Generic_RegularExpression_Type(void *arg MAYBE_UNUSED)
 
       if (preg)
        {
-         T((T_CREATE("RegExp_Arg %p"), preg));
+         T((T_CREATE("RegExp_Arg %p"), (void *)preg));
          if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
              && !regcomp(preg->pRegExp, rx,
                          (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
            {
-             T((T_CREATE("regex_t %p"), preg->pRegExp));
-             preg->refCount = typeMalloc(unsigned long, 1);
-
-             *(preg->refCount) = 1;
+             T((T_CREATE("regex_t %p"), (void *)preg->pRegExp));
+             if ((preg->refCount = typeMalloc(unsigned long, 1)) != 0)
+                *(preg->refCount) = 1;
            }
          else
            {
@@ -151,9 +150,8 @@ Generic_RegularExpression_Type(void *arg MAYBE_UNUSED)
 
          T((T_CREATE("RegExp_Arg %p"), pArg));
          pArg->compiled_expression = NULL;
-         pArg->refCount = typeMalloc(unsigned long, 1);
-
-         *(pArg->refCount) = 1;
+         if ((pArg->refCount = typeMalloc(unsigned long, 1)) != 0)
+            *(pArg->refCount) = 1;
 
          do
            {