From 1cd24380ceb443ed15a54693b1344d64bf7a9c1e Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 16 Jun 2016 10:55:49 -0400
Subject: [PATCH] more sensible fix to #1725

---
 src/js/scriptlets/element-picker.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/js/scriptlets/element-picker.js b/src/js/scriptlets/element-picker.js
index e53a7f711..30b08ed70 100644
--- a/src/js/scriptlets/element-picker.js
+++ b/src/js/scriptlets/element-picker.js
@@ -337,19 +337,17 @@ var backgroundImageURLFromElement = function(elem) {
 /******************************************************************************/
 
 // https://github.com/gorhill/uBlock/issues/1725#issuecomment-226479197
-// Limit returned string to 2048 characters.
+// Limit returned string to 1024 characters.
+// Also, return only URLs which will be seen by an HTTP observer.
 
 var resourceURLFromElement = function(elem) {
     var tagName = elem.localName, s;
-    if ( (s = netFilter1stSources[tagName]) ) {
+    if (
+        (s = netFilter1stSources[tagName]) ||
+        (s = netFilter2ndSources[tagName])
+    ) {
         s = elem[s];
-        if ( typeof s === 'string' && s !== '' ) {
-            return s.slice(0, 1024);
-        }
-    }
-    if ( (s = netFilter2ndSources[tagName]) ) {
-        s = elem[s];
-        if ( typeof s === 'string' && s !== '' ) {
+        if ( typeof s === 'string' && /^https?:\/\//.test(s) ) {
             return s.slice(0, 1024);
         }
     }
@@ -514,6 +512,10 @@ var filterTypes = {
 
 // Extract the best possible cosmetic filter, i.e. as specific as possible.
 
+// https://github.com/gorhill/uBlock/issues/1725
+// Also take into account the `src` attribute for `img` elements -- and limit
+// the value to the 1024 first characters.
+
 var cosmeticFilterFromElement = function(elem) {
     if ( elem === null ) {
         return 0;
@@ -562,9 +564,15 @@ var cosmeticFilterFromElement = function(elem) {
             }
             break;
         case 'img':
+            v = elem.getAttribute('src');
+            if ( v && v.length !== 0 ) {
+                attributes.push({ k: 'src', v: v.slice(0, 1024) });
+                break;
+            }
             v = elem.getAttribute('alt');
             if ( v && v.length !== 0 ) {
                 attributes.push({ k: 'alt', v: v });
+                break;
             }
             break;
         default: