undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: fix bug with encoding of p4 client name

Browse Source 
The Perforce client name can contain arbitrary characters
which do not decode to UTF-8. Use the fallback strategy
implemented in metadata_stream_to_writable_bytes() also
for the client name.

Signed-off-by: Kilian Kilger <kkilger@gmail.com>
Reviewed-by: Tao Klerks <tao@klerks.biz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kilian Kilger 2022-07-08 08:01:00 +00:00 committed by Junio C Hamano
parent e4a4b31577
commit 34f67c9619
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-p4.py
View File

@ -854,12 +854,12 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
if bytes is not str: if bytes is not str:
# Decode unmarshalled dict to use str keys and values, except for: # Decode unmarshalled dict to use str keys and values, except for:
# - `data` which may contain arbitrary binary data # - `data` which may contain arbitrary binary data
# - `desc` or `FullName` which may contain non-UTF8 encoded text handled below, eagerly converted to bytes # - `desc` or `client` or `FullName` which may contain non-UTF8 encoded text handled below, eagerly converted to bytes
# - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text, handled by decode_path() # - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text, handled by decode_path()
decoded_entry = {} decoded_entry = {}
for key, value in entry.items(): for key, value in entry.items():
key = key.decode() key = key.decode()
if isinstance(value, bytes) and not (key in ('data', 'desc', 'FullName', 'path', 'clientFile') or key.startswith('depotFile')): if isinstance(value, bytes) and not (key in ('data', 'desc', 'FullName', 'path', 'clientFile', 'client') or key.startswith('depotFile')):
value = value.decode() value = value.decode()
decoded_entry[key] = value decoded_entry[key] = value
# Parse out data if it's an error response # Parse out data if it's an error response
@ -871,6 +871,8 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
continue continue
if 'desc' in entry: if 'desc' in entry:
entry['desc'] = metadata_stream_to_writable_bytes(entry['desc']) entry['desc'] = metadata_stream_to_writable_bytes(entry['desc'])
if 'client' in entry:
entry['client'] = metadata_stream_to_writable_bytes(entry['client'])
if 'FullName' in entry: if 'FullName' in entry:
entry['FullName'] = metadata_stream_to_writable_bytes(entry['FullName']) entry['FullName'] = metadata_stream_to_writable_bytes(entry['FullName'])
if cb is not None: if cb is not None: