/*****************************************************************************
- * vlm.c: VLM interface plugin
+ * vlmshell.c: VLM interface plugin
*****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
+ * Copyright (C) 2000-2005 VLC authors and VideoLAN
* $Id$
*
* Authors: Simon Latapie <garf@videolan.org>
* Laurent Aimar <fenrir@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
*/
static const char *FindCommandEnd( const char *psz_sent )
{
- char c, quote = 0;
+ unsigned char c, quote = 0;
while( (c = *psz_sent) != '\0' )
{
*/
static int Unescape( char *out, const char *in )
{
- char c, quote = 0;
+ unsigned char c, quote = 0;
bool param = false;
while( (c = *in++) != '\0' )
vlm_message_t **pp_message )
{
size_t i_command = 0;
- char buf[strlen (psz_command) + 1], *psz_buf = buf;
- char *ppsz_command[3+sizeof (buf) / 2];
+ size_t i_command_len = strlen( psz_command );
+ char *buf = malloc( i_command_len + 1 ), *psz_buf = buf;
+ size_t i_ppsz_command_len = (3 + (i_command_len + 1) / 2);
+ char **ppsz_command = malloc( i_ppsz_command_len * sizeof(char *) );
vlm_message_t *p_message = NULL;
+ int i_ret = 0;
+
+ if( !psz_buf || !ppsz_command )
+ {
+ p_message = vlm_MessageNew( ppsz_command[0],
+ "Memory allocation failed for command of length %zu",
+ i_command_len );
+ goto error;
+ }
/* First, parse the line and cut it */
while( *psz_command != '\0' )
{
const char *psz_temp;
- if(isspace (*psz_command))
+ if(isspace ((unsigned char)*psz_command))
{
psz_command++;
continue;
goto error;
}
- assert (i_command < (sizeof (ppsz_command) / sizeof (ppsz_command[0])));
+ assert (i_command < i_ppsz_command_len);
ppsz_command[i_command] = psz_buf;
memcpy (psz_buf, psz_command, psz_temp - psz_command);
psz_buf += psz_temp - psz_command + 1;
psz_command = psz_temp;
- assert (buf + sizeof (buf) >= psz_buf);
+ assert (buf + i_command_len + 1 >= psz_buf);
}
/*
else IF_EXECUTE( "setup", (i_command < 2), ExecuteSetup(p_vlm, ppsz_command[1], i_command-2, &ppsz_command[2], &p_message) )
else
{
- p_message = vlm_MessageNew( ppsz_command[0], "Unknown command" );
+ p_message = vlm_MessageNew( ppsz_command[0], "Unknown VLM command" );
goto error;
}
#undef IF_EXECUTE
success:
*pp_message = p_message;
+ free( buf );
+ free( ppsz_command );
return VLC_SUCCESS;
syntax_error:
- return ExecuteSyntaxError( ppsz_command[0], pp_message );
+ i_ret = ExecuteSyntaxError( ppsz_command[0], pp_message );
+ free( buf );
+ free( ppsz_command );
+ return i_ret;
error:
*pp_message = p_message;
+ free( buf );
+ free( ppsz_command );
return VLC_EGENERIC;
}