Changeset 454 for trunk/src/sh_unix.c

Timestamp:

Jun 29, 2014, 7:30:04 AM (10 years ago)

Author:

katerina

Message:

Fix for ticket #355 (use calloc instead of malloc).

File:

• trunk/src/sh_unix.c (modified) (5 diffs)

trunk/src/sh_unix.c

@@ -1475 +1475 @@
 
   /* printf("-> %2d: slots allocated\n", envlen); */
-  env1 = malloc (sizeof(char *) * envlen);      /* only once */
+  env1 = calloc(1,sizeof(char *) * envlen);      /* only once */
   if (env1 == NULL)
     {
@@ -1486 +1486 @@
   while (env0 != NULL && env0[envlen] != NULL) {
     len = strlen(env0[envlen]) + 1;
-    env1[envlen] = malloc (len); /* only once */
+    env1[envlen] = calloc(1,len); /* only once */
     if (env1[envlen] == NULL)
       {
@@ -1910 +1910 @@
     {
       len = strlen(str) + 1;
-      chroot_dir = malloc(strlen(str) + 1);  /* only once */
+      chroot_dir = calloc(1,strlen(str) + 1);  /* only once */
       if (!chroot_dir)
         {
@@ -4349 +4349 @@
               sh_error_handle (level, FIL__, __LINE__, stat_return, 
                                MSG_FI_STAT,
-                               _("lstat"),
+                               _("lstat (link target)"),
                                sh_error_message (stat_return,errbuf, sizeof(errbuf)), 
                                (long) euid,
@@ -5568 +5568 @@
   ptr = pthread_getspecific(gSigtrapVariables_key);
   if (ptr == NULL) {
-    ptr = malloc(sizeof(struct sh_sigtrap_variables));
+    ptr = calloc(1,sizeof(struct sh_sigtrap_variables));
     if (ptr == NULL) {
       return NULL;