re PR libobjc/9751 (malloc of strlen, not strlen+1)

2006-01-24  David Ayers  <d.ayers@inode.at>

	PR libobjc/9751
	* gc.c (class_ivar_set_gcinvisible): Replace strncpy with memcpy
	and insure the new strings are '\0' termintated.

From-SVN: r110187

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index e8fdc1591cca09a46feee44afffc9bcc73877736..910ae986922a9fa1c601717d3cb9300c4e52173d 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-24  David Ayers  <d.ayers@inode.at>
+
+       PR libobjc/9751
+       * gc.c (class_ivar_set_gcinvisible): Replace strncpy with memcpy
+       and insure the new strings are '\0' termintated.
+
 2006-01-24  David Ayers  <d.ayers@inode.at>
 
        PR libobjc/13946

diff --git a/libobjc/gc.c b/libobjc/gc.c
index 399d1aa8d734b84b891433f869676bf584228344..51019993f3d145cad51d253f047b335c9202f264 100644 (file)
--- a/libobjc/gc.c
+++ b/libobjc/gc.c
@@ -397,30 +397,34 @@ class_ivar_set_gcinvisible (Class class, const char *ivarname,
       if (*type == _C_GCINVISIBLE)
        {
          char *new_type;
+         size_t len;
 
          if (gc_invisible || ! __objc_ivar_pointer (type))
            return;     /* The type of the variable already matches the
                           requested gc_invisible type */
 
-         /* The variable is gc_invisible and we have to reverse it */
-         new_type = objc_atomic_malloc (strlen (ivar->ivar_type));
-         strncpy (new_type, ivar->ivar_type,
-                  (size_t)(type - ivar->ivar_type));
+         /* The variable is gc_invisible so we make it gc visible.  */
+         new_type = objc_atomic_malloc (strlen(ivar->ivar_type));
+         len = (type - ivar->ivar_type);
+         memcpy (new_type, ivar->ivar_type, len);
+         new_type[len] = 0;
          strcat (new_type, type + 1);
          ivar->ivar_type = new_type;
        }
       else
        {
          char *new_type;
+         size_t len;
 
          if (! gc_invisible || ! __objc_ivar_pointer (type))
            return;     /* The type of the variable already matches the
                           requested gc_invisible type */
 
-         /* The variable is gc visible and we have to make it gc_invisible */
-         new_type = objc_malloc (strlen (ivar->ivar_type) + 2);
-         strncpy (new_type, ivar->ivar_type,
-                  (size_t)(type - ivar->ivar_type));
+         /* The variable is gc visible so we make it gc_invisible.  */
+         new_type = objc_malloc (strlen(ivar->ivar_type) + 2);
+         len = (type - ivar->ivar_type);
+         memcpy (new_type, ivar->ivar_type, len);
+         new_type[len] = 0;
          strcat (new_type, "!");
          strcat (new_type, type);
          ivar->ivar_type = new_type;