chiark / gitweb /
More strict string search regex
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 27 May 2014 08:10:15 +0000 (10:10 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 27 May 2014 08:10:15 +0000 (10:10 +0200)
fdroidserver/common.py

index b7ee50818b38e0e7e73cad3d94ab3553cea77096..193b444382bb45d4508f87bdaefff68f993bd5ff 100644 (file)
@@ -712,7 +712,7 @@ def retrieve_string(app_dir, string, xmlfiles=None):
 
     string_search = None
     if string.startswith('@string/'):
-        string_search = re.compile(r'.*"' + string[8:] + '".*?>([^<]+?)<.*').search
+        string_search = re.compile(r'.*name="' + string[8:] + '".*?>([^<]+?)<.*').search
     elif string.startswith('&') and string.endswith(';'):
         string_search = re.compile(r'.*<!ENTITY.*' + string[1:-1] + '.*?"([^"]+?)".*>').search