Merge pull request #2491 from matrix-org/rav/port_db_fixes

Drop search values with nul characters
This commit is contained in:
Richard van der Hoff 2017-10-03 13:49:05 +01:00 committed by GitHub
commit e4779be97a

View File

@ -376,10 +376,13 @@ class Porter(object):
" VALUES (?,?,?,?,to_tsvector('english', ?),?,?)" " VALUES (?,?,?,?,to_tsvector('english', ?),?,?)"
) )
rows_dict = [ rows_dict = []
dict(zip(headers, row)) for row in rows:
for row in rows d = dict(zip(headers, row))
] if "\0" in d['value']:
logger.warn('dropping search row %s', d)
else:
rows_dict.append(d)
txn.executemany(sql, [ txn.executemany(sql, [
( (