Changeset a4fc367 in mainline

Timestamp:

2006-05-14T09:28:02Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2be27868

Parents:

6326f5e6

Message:

memory deallocation fix in sysinfo syscall handlers

File:

• generic/src/sysinfo/sysinfo.c (modified) (2 diffs)

generic/src/sysinfo/sysinfo.c

@@ -257 +257 @@
         str=malloc(len+1,0);
         ASSERT(str);
-        if(copy_from_uspace(str,(void *)ptr,len+1)) return 0;
-        if(str[len]) return 0;          /*This is not len lenght C string*/
-        ret=sysinfo_get_val(str,NULL);
+        if(!((copy_from_uspace(str,(void *)ptr,len+1))||(str[len]))) 
+                ret=sysinfo_get_val(str,NULL);
         free(str);
         return ret.valid;
@@ -270 +269 @@
         str=malloc(len+1,0);
         ASSERT(str);
-        if(copy_from_uspace(str,(void *)ptr,len+1)) return 0;
-        if(str[len]) return 0;          /*This is not len lenght C string*/
-        ret=sysinfo_get_val(str,NULL);
+        if(!((copy_from_uspace(str,(void *)ptr,len+1))||(str[len]))) 
+                ret=sysinfo_get_val(str,NULL);
         free(str);
         return ret.val;