Skip to content

Commit 814bd47

Browse files
authored
Merge pull request #953 from hppritcha/squash_NULS_in_submits_to_sql
scrub entries to sql database of NUL chars
2 parents 9982de9 + d0ac496 commit 814bd47

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

server/php/cherrypy/src/webapp/db_pgv3.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ def _select_insert(self, table, table_id, stmt_fields, stmt_values):
616616

617617
cursor = self.get_cursor()
618618

619-
values = tuple(insert_stmt_values)
620-
# values = values.replace("\x00", "\uFFFD")
619+
values = tuple(s.replace("\x00", "\uFFFD") if isinstance(s, str) else s
620+
for s in insert_stmt_values)
621621
cursor.execute( select_stmt, values )
622622
rows = cursor.fetchone()
623623
if rows is not None:
@@ -634,8 +634,8 @@ def _select_insert(self, table, table_id, stmt_fields, stmt_values):
634634
found_id = self._get_nextval( "%s_%s_seq" % (table, table_id))
635635

636636
insert_stmt_values.insert(0, found_id)
637-
values = tuple(insert_stmt_values)
638-
# values = values.replace("\x00", "\uFFFD")
637+
values = tuple(s.replace("\x00", "\uFFFD") if isinstance(s, str) else s
638+
for s in insert_stmt_values)
639639
cursor.execute( insert_stmt, values )
640640
# Make sure to commit after every INSERT
641641
self._connection.commit()

0 commit comments

Comments
 (0)