Changeset da7b484

Timestamp:

2008-06-21T17:09:20Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

edc767b

Parents:

d419073

Message:

Fixed memory leaking ipc_readline().

File:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -209 +209 @@
 }
 
+/* Return just one line. Returns NULL if something broke, an empty string
+   on temporary "errors" (EAGAIN and friends). */
 static char *ipc_readline( int fd )
 {
-        char *buf, *eol;
+        char buf[513], *eol;
         int size;
-        
-        buf = g_new0( char, 513 );
         
         /* Because this is internal communication, it should be pretty safe
@@ -221 +221 @@
            sockets and limites message length, messages should always be
            complete. Saves us quite a lot of code and buffering. */
-        size = recv( fd, buf, 512, MSG_PEEK );
+        size = recv( fd, buf, sizeof( buf ) - 1, MSG_PEEK );
         if( size == 0 || ( size < 0 && !sockerr_again() ) )
                 return NULL;
@@ -229 +229 @@
                 buf[size] = 0;
         
-        eol = strstr( buf, "\r\n" );
-        if( eol == NULL )
+        if( ( eol = strstr( buf, "\r\n" ) ) == NULL )
                 return NULL;
         else
                 size = eol - buf + 2;
-        
-        g_free( buf );
-        buf = g_new0( char, size + 1 );
         
         if( recv( fd, buf, size, 0 ) != size )
                 return NULL;
         else
-                buf[size-2] = 0;
-        
-        return buf;
+                return g_strndup( buf, size - 2 );
 }