Change 14636

jmistry
jmistry committed this change into //guest/perforce_software/p4ruby/main
Request Review
Download .zip
Fix binary file resolve

Accessing the base_name attribute of a P4::MergeData object resulted
in a segmentation fault when resolving binary files. This is because the
base file is empty for binary files, and the Name() method invoked on it does
not protect itself in case of a NULL value.

User visible change, to be documented in the release notes.
  • Files 4
  • Comments 0
4 edited 0 added 0 deleted
clientuserruby.cpp#23
Loading...
p4mergedata.cpp#6
Loading...
p4mergedata.h#5
Loading...
test/05_resolve.rb#5
Loading...
Tip: Use n and p to cycle through the changes.