From a546b9abc048df35df75741a2cf6c9fb3d31c478 Mon Sep 17 00:00:00 2001
From: albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 10 Jan 2004 14:38:07 +0000
Subject: Fix long standing bug where last (and sometimes first) char of the
 hostname got ripped. Also fix url unescaping with hex A ... F

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11772 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 m_option.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'm_option.c')

diff --git a/m_option.c b/m_option.c
index 252d924100..3be937f76b 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1595,8 +1595,8 @@ m_option_type_t m_option_type_obj_presets = {
 
 static int parse_custom_url(m_option_t* opt,char *name,
 			    char *url, void* dst, int src) {
-  int pos1, pos2, r;
-  char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL;
+  int pos1, pos2, r, v6addr = 0;
+  char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL;
   m_struct_t* desc = opt->priv;
   
   if(!desc) {
@@ -1688,11 +1688,14 @@ static int parse_custom_url(m_option_t* opt,char *name,
   // in an IPv6 URL the numeric address should be inside square braces.
   ptr2 = strstr(ptr1, "[");
   ptr3 = strstr(ptr1, "]");
-  if( ptr2!=NULL && ptr3!=NULL ) {
+  // If the [] is after the first it isn't the hostname
+  ptr4 = strstr(ptr1, "/");
+  if( ptr2!=NULL && ptr3!=NULL && (ptr2 < ptr3) && (!ptr4 || ptr4 > ptr3)) {
     // we have an IPv6 numeric address
     ptr1++;
     pos1++;
     ptr2 = ptr3;
+    v6addr = 1;
   } else {
     ptr2 = ptr1;  
   }
@@ -1733,7 +1736,7 @@ static int parse_custom_url(m_option_t* opt,char *name,
     }
     pos2 = ptr2-url;
   }
-  if( strstr(ptr1, "]")!=NULL ) pos2--;
+  if( v6addr ) pos2--;
   // Get the hostname
   if(pos2-pos1 > 0) {
     if(!m_option_list_find(desc->fields,"hostname")) {
-- 
cgit v1.2.3