Changeset 148 for trunk/lib/winsec.c

Timestamp:

02/22/09 18:22:59 (15 years ago)

Author:

tim

Message:

integrated talloc into range_list

fixed some uninitialized structure values in the winsec library

File:

• trunk/lib/winsec.c (modified) (13 diffs)

trunk/lib/winsec.c

@@ -55 +55 @@
   if (buf == NULL || buf_len <  WINSEC_DESC_HEADER_SIZE)
     return NULL;
-  /*
-  if((ret_val = (WINSEC_DESC*)zalloc(sizeof(WINSEC_DESC))) == NULL)
-    return NULL;
-  */
+
   if((ret_val = talloc(talloc_ctx, WINSEC_DESC)) == NULL)
     return NULL;
@@ -86 +83 @@
   }
 
-  if(ret_val->off_owner_sid != 0)
+  if(ret_val->off_owner_sid == 0)
+    ret_val->owner_sid = NULL;
+  else
   {
     ret_val->owner_sid = winsec_parse_dom_sid(ret_val, 
@@ -98 +97 @@
   }
 
-  if (ret_val->off_grp_sid != 0) 
+  if(ret_val->off_grp_sid == 0) 
+    ret_val->grp_sid = NULL;
+  else
   {
     ret_val->grp_sid = winsec_parse_dom_sid(ret_val, buf + ret_val->off_grp_sid,
@@ -109 +110 @@
   }
 
-  if ((ret_val->control & WINSEC_DESC_SACL_PRESENT) && ret_val->off_sacl)
+  if((ret_val->control & WINSEC_DESC_SACL_PRESENT) && ret_val->off_sacl)
   {
     ret_val->sacl = winsec_parse_acl(ret_val, buf + ret_val->off_sacl,
@@ -119 +120 @@
     }
   }
-
-  if ((ret_val->control & WINSEC_DESC_DACL_PRESENT) && ret_val->off_dacl != 0) 
+  else
+    ret_val->sacl = NULL;
+
+  if((ret_val->control & WINSEC_DESC_DACL_PRESENT) && ret_val->off_dacl != 0) 
   {
     ret_val->dacl = winsec_parse_acl(ret_val, buf + ret_val->off_dacl,
@@ -130 +133 @@
     }
   }
+  else
+    ret_val->dacl = NULL;
 
   return ret_val;
@@ -150 +155 @@
   if (buf == NULL || buf_len < 8)
     return NULL;
-  /*
-  if((ret_val = (WINSEC_ACL*)zalloc(sizeof(WINSEC_ACL))) == NULL)
-    return NULL;
-  */
+
   if((ret_val = talloc(talloc_ctx, WINSEC_ACL)) == NULL)
     return NULL;
@@ -175 +177 @@
    * (allow no access).
    */
-  /*  if((ret_val->aces = (WINSEC_ACE**)zcalloc(sizeof(WINSEC_ACE*),
-                                           ret_val->num_aces+1)) == NULL)
-  */
   if((ret_val->aces = talloc_array(ret_val, WINSEC_ACE*, 
                                    ret_val->num_aces+1)) == NULL)
@@ -203 +202 @@
     }
   }
+  ret_val->aces[ret_val->num_aces] = NULL;
 
   return ret_val;
@@ -219 +219 @@
   if(buf == NULL || buf_len < WINSEC_ACE_MIN_SIZE)
     return NULL;
-
-  /*  if((ret_val = (WINSEC_ACE*)zalloc(sizeof(WINSEC_ACE))) == NULL)*/
 
   if((ret_val = talloc(talloc_ctx, WINSEC_ACE)) == NULL)
@@ -249 +247 @@
       offset += sizeof(WINSEC_UUID);
     }
+    else
+      ret_val->obj_guid = NULL;
 
     if(ret_val->obj_flags & WINSEC_ACE_OBJECT_INHERITED_PRESENT)
@@ -261 +261 @@
       offset += sizeof(WINSEC_UUID);
     }
+    else
+      ret_val->inh_guid = NULL;
   }
 
@@ -322 +324 @@
     return false;
 
-  /* if((ret_val = (WINSEC_UUID*)zalloc(sizeof(WINSEC_UUID))) == NULL)*/
   if((ret_val = talloc(talloc_ctx, WINSEC_UUID)) == NULL)
     return NULL;