[Slim-Checkins] r10186 - /branches/6.5/server/Slim/Utils/Scanner.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Oct  4 12:07:56 2006
New Revision: 10186

URL: http://svn.slimdevices.com?rev=10186&view=rev
Log:
Avoid sending bad URLs through scanWMAStream

Modified:
    branches/6.5/server/Slim/Utils/Scanner.pm

Modified: branches/6.5/server/Slim/Utils/Scanner.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Utils/Scanner.pm?rev=10186&r1=10185&r2=10186&view=diff
==============================================================================
--- branches/6.5/server/Slim/Utils/Scanner.pm (original)
+++ branches/6.5/server/Slim/Utils/Scanner.pm Wed Oct  4 12:07:56 2006
@@ -920,6 +920,14 @@
 sub scanWMAStream {
 	my $args = shift;
 	
+	# Make sure we don't send any bad URLs through
+	$args->{'url'} = 'httpt://wm-live.abacast.com/arabian_radio-dubai92-24';
+	if ( $args->{'url'} !~ /^http:/ ) {
+		my $error = 'Invalid URL: ' . $args->{'url'};
+		scanWMAStreamError( undef, $error, $args );
+		return;
+	}
+	
 	my $request = HTTP::Request->new( GET => $args->{'url'} );
 	
 	addWMAHeaders( $request );