diff 버그 수정

route/tool/func.py

@@ -517,14 +517,14 @@ def diff(seqm):
 
     for opcode, a0, a1, b0, b1 in seqm.get_opcodes():
         if opcode == 'equal':
-            output += [seqm.a[a0:a1]]
+            output += [html.escape(seqm.a[a0:a1])]
         elif opcode == 'insert':
-            output += ["<span style='background:#CFC;'>" + seqm.b[b0:b1] + "</span>"]
+            output += ["<span style='background:#CFC;'>" + html.escape(seqm.b[b0:b1]) + "</span>"]
         elif opcode == 'delete':
-            output += ["<span style='background:#FDD;'>" + seqm.a[a0:a1] + "</span>"]
+            output += ["<span style='background:#FDD;'>" + html.escape(seqm.a[a0:a1]) + "</span>"]
         elif opcode == 'replace':
-            output += ["<span style='background:#FDD;'>" + seqm.a[a0:a1] + "</span>"]
-            output += ["<span style='background:#CFC;'>" + seqm.b[b0:b1] + "</span>"]
+            output += ["<span style='background:#FDD;'>" + html.escape(seqm.a[a0:a1]) + "</span>"]
+            output += ["<span style='background:#CFC;'>" + html.escape(seqm.b[b0:b1]) + "</span>"]
 
     end = ''.join(output)
     end = end.replace('\r\n', '\n')

route/view_diff_data.py

@@ -19,18 +19,15 @@ def view_diff_data_2(conn, name):
         curs.execute(db_change("select data from history where id = ? and title = ?"), [second, name])
         second_raw_data = curs.fetchall()
         if second_raw_data:
-            first_data = html.escape(first_raw_data[0][0])            
-            second_data = html.escape(second_raw_data[0][0])
-
             if first == second:
-                result = '-'
+                result = ''
             else:            
-                diff_data = difflib.SequenceMatcher(None, first_data, second_data)
-                result = re.sub('\r', '', diff(diff_data))
+                diff_data = difflib.SequenceMatcher(None, first_raw_data[0][0], second_raw_data[0][0])
+                result = '<pre>' + diff(diff_data) + '</pre>'
             
             return easy_minify(flask.render_template(skin_check(), 
                 imp = [name, wiki_set(), custom(), other2([' (' + load_lang('compare') + ')', 0])],
-                data = '<pre>' + result + '</pre>',
+                data = result,
                 menu = [['history/' + url_pas(name), load_lang('return')]]
             ))
 

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-18",
+        "r_ver" : "v3.1.5-master-19",
         "c_ver" : "400006",
         "s_ver" : "6"
     }, "stable" : {