Changeset 78d254f1

Timestamp:

2010-03-18T00:07:16Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b8a491d

Parents:

42fc5b6

Message:

More small fixes. (NULL derefs and s/close/disconnect/)

Location:

protocols/jabber

Files:

• s5bytestream.c (modified) (1 diff)
• si.c (modified) (4 diffs)

protocols/jabber/s5bytestream.c

@@ -282 +282 @@
         while( ( shnode = xt_find_node( shnode, "streamhost" ) ) )
         {
-                char *jid, *host;
+                char *jid, *host, *port_s;
                 int port;
                 if( ( jid = xt_find_attr( shnode, "jid" ) ) &&
                     ( host = xt_find_attr( shnode, "host" ) ) &&
-                    ( ( port = atoi( xt_find_attr( shnode, "port" ) ) ) ) )
+                    ( port_s = xt_find_attr( shnode, "port" ) ) &&
+                    ( sscanf( port_s, "%d", &port ) == 1 ) )
                 {
                         jabber_streamhost_t *sh = g_new0( jabber_streamhost_t, 1 );

protocols/jabber/si.c

@@ -41 +41 @@
         if( tf->fd != -1 )
         {
-                close( tf->fd );
+                disconnect( tf->fd );
                 tf->fd = -1;
         }
@@ -52 +52 @@
         g_free( tf->iq_id );
         g_free( tf->sid );
+        g_free( tf );
 }
 
@@ -204 +205 @@
 {
         struct xt_node *c, *d, *reply;
-        char *sid, *ini_jid, *tgt_jid, *iq_id, *s, *ext_jid;
+        char *sid, *ini_jid, *tgt_jid, *iq_id, *s, *ext_jid, *size_s;
         struct jabber_buddy *bud;
         int requestok = FALSE;
@@ -230 +231 @@
             !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FILETRANSFER ) == 0            ) ||
             !( name             = xt_find_attr( d, "name" )                             ) ||
-            !( size             = (size_t) atoll( xt_find_attr( d, "size" ) )           ) ||
+            !( size_s           = xt_find_attr( d, "size" )                             ) ||
+            !( 1               == sscanf( size_s, "%lld", &size )                       ) ||
             !( d                = xt_find_node( sinode->children, "feature" )           ) ||
             !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FEATURE ) == 0                 ) ||