Changeset 3f81999 for root_commands.c

Timestamp:

2010-06-03T10:31:46Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

5f8ab6a9

Parents:

fc34fb5 (diff), 2e44b1f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in bitlbee 1.2.4

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -310 +310 @@
                 int st;
                 
-                if( checkflags && checkflags( irc, s ) == 0 )
+                if( s && checkflags && checkflags( irc, s ) == 0 )
                         return 0;
                 
@@ -1079 +1079 @@
         else if( g_strcasecmp( cmd[1], "set" ) == 0 )
         {
+                MIN_ARGS( 2 );
+                
                 cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead, NULL );
         }