[Redbutton-devel] SF.net SVN: redbutton:[520] redbutton-browser/trunk/si.c

[<ski...@us...>]

Revision: 520
          http://redbutton.svn.sourceforge.net/redbutton/?rev=520&view=rev
Author:   skilvington
Date:     2009-04-07 12:53:00 +0000 (Tue, 07 Apr 2009)

Log Message:
-----------
don't allow NULL service references

Modified Paths:
--------------
    redbutton-browser/trunk/si.c

Modified: redbutton-browser/trunk/si.c
===================================================================
--- redbutton-browser/trunk/si.c	2009-04-07 09:23:46 UTC (rev 519)
+++ redbutton-browser/trunk/si.c	2009-04-07 12:53:00 UTC (rev 520)
@@ -32,8 +32,13 @@
 	int i;
 
 	/* resolve it to dvb:// format */
-	if(OctetString_strcmp(ref, "rec://svc/def") == 0)
+	if(ref == NULL || ref->size == 0)
 	{
+		error("si_get_index: NULL service requested");
+		return -1;
+	}
+	else if(OctetString_strcmp(ref, "rec://svc/def") == 0)
+	{
 		/* promise we wont change it */
 		ref = (OctetString *) MHEGEngine_getRecSvcDef();
 		verbose("si_get_index: resolved '%.*s' to '%.*s'", orig->size, orig->data, ref->size, ref->data);
@@ -53,6 +58,7 @@
 	else if(OctetString_strncmp(ref, "dvb:", 4) != 0)
 	{
 		error("si_get_index: unexpected service '%.*s'", ref->size, ref->data);
+		return -1;
 	}
 
 	/* have we assigned it already */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.