Changeset 4119

Timestamp:

01/25/09 14:14:29 (4 years ago)

Author:

jow

Message:

Merge r4115 r4118

Files:

• luci/branches/luci-0.8/libs/core/luasrc/util.lua (modified) (1 diff)

luci/branches/luci-0.8/libs/core/luasrc/util.lua

@@ -194 +194 @@
 -- @param value String value containing the data to escape
 -- @return      String value containing the escaped data
-local _pcdata_repl = {
-                ["&"] = "&",
-                ['"'] = """,
-                ["'"] = "'",
-                ["<"] = "&#60;",
-                [">"] = "&#62;"
-}
+local function _pcdata_repl(c)
+    local i = string.byte(c)
+
+    if ( i >= 0x00 and i <= 0x08 ) or ( i >= 0x0B and i <= 0x0C ) or
+       ( i >= 0x0E and i <= 0x1F ) or ( i == 0x7F )
+    then
+        return ""
+        
+    elseif ( i == 0x26 ) or ( i == 0x27 ) or ( i == 0x22 ) or
+           ( i == 0x3C ) or ( i == 0x3E )
+    then
+        return string.format("&#%i;", i)
+    end
+
+    return c
+end
 
 function pcdata(value)
-    return value and tostring(value):gsub("[&\"'<>]", _pcdata_repl)
+    return value and tostring(value):gsub("[&\"'<>%c]", _pcdata_repl)
 end