Kaynağa Gözat

Remove some ptr check before free (thx flx42 for pointing that out)

Julien 'Lta' BALLET 11 yıl önce
ebeveyn
işleme
37d2c11ec1
4 değiştirilmiş dosya ile 9 ekleme ve 18 silme
  1. 1 2
      src/netbios_query.c
  2. 2 2
      src/netbios_session.c
  3. 2 5
      src/smb_message.c
  4. 4 9
      src/smb_session.c

+ 1 - 2
src/netbios_query.c

@@ -49,8 +49,7 @@ void              netbios_query_destroy(netbios_query *q)
 {
   assert(q);
 
-  if (q->packet)
-    free(q->packet);
+  free(q->packet);
   free(q);
 }
 

+ 2 - 2
src/netbios_session.c

@@ -66,8 +66,8 @@ void              netbios_session_destroy(netbios_session *s)
   if (!s)
     return;
   close(s->socket);
-  if (s->packet)
-    free(s->packet);
+
+  free(s->packet);
   free(s);
 }
 

+ 2 - 5
src/smb_message.c

@@ -72,11 +72,8 @@ smb_message   *smb_message_grow(smb_message *msg, size_t size)
 void            smb_message_destroy(smb_message *msg)
 {
   if (msg != NULL)
-  {
-    if (msg->packet != NULL)
-      free(msg->packet);
-    free(msg);
-  }
+    free(msg->packet);
+  free(msg);
 }
 
 int             smb_message_append(smb_message *msg, const void *data,

+ 4 - 9
src/smb_session.c

@@ -67,21 +67,16 @@ void            smb_session_destroy(smb_session *s)
       s->transport.session = NULL;
     }
 
-    if (s->spnego.init != NULL)
-      free(s->spnego.init);
+    free(s->spnego.init);
     if (s->spnego.asn1_def != NULL)
       asn1_delete_structure(&s->spnego.asn1_def);
 
     smb_buffer_free(&s->xsec_target);
 
     // Free stored credentials.
-    if (s->creds.domain != NULL)
-      free(s->creds.domain);
-    if (s->creds.login != NULL)
-      free(s->creds.login);
-    if (s->creds.password != NULL)
-      free(s->creds.password);
-
+    free(s->creds.domain);
+    free(s->creds.login);
+    free(s->creds.password);
     free(s);
   }
 }