From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 17 Oct 2014 14:45:10 +0000 (+0000)
Subject: Prevent img-reorder from messing up img tags with empty src attributes
X-Git-Tag: v_3_0_22~66
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=02d86846f79824a54f496babf512efddbd67b6e9

Prevent img-reorder from messing up img tags with empty src attributes

Fixes #880 reported by Duncan.
---

diff --git a/default.filter b/default.filter
index 3f63e99b..46408c08 100644
--- a/default.filter
+++ b/default.filter
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.90 2014/05/05 09:59:51 fabiankeil Exp $
+#  $Id: default.filter,v 1.91 2014/06/20 09:46:13 fabiankeil Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
@@ -219,11 +219,11 @@ FILTER: img-reorder Reorder attributes in <img> tags to make the banners-by-* fi
 # This makes banners-by-size more effective and allows both banners-by-size
 # and banners-by-link to preserve the original image URL in the title attribute.
 
-s|<img\s+?([^>]*)\ssrc\s*=\s*(['"])([^>\\\2]+)\2|<img src=$2$3$2 $1|siUg
+s|<img\s+?([^>]*)\ssrc\s*=\s*(['"])([^>'" ]+)\2|<img src=$2$3$2 $1|siUg
 s|<img\s+?([^>]*)\ssrc\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig
 s|(<img[^>]+height)\s*=\s*|$1=|sig
 
-s|<img (src=(?:(['"])[^>\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|<img $1 width=$4$3|siUg
+s|<img (src=(?:(['"])[^>'" ]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|<img $1 width=$4$3|siUg
 
 
 #################################################################################