Put a bandaid on the NULL pointer dereference caused by doing an
"update -jHEAD" when a file has been added on the specified tag. It doesn't actually make cvs 'handle' it, it just stops it from dying and leaving stray locks and other wreckage. This was suggested by the CVS maintainers, and is in cvs-1.5.1-950901.
This commit is contained in:
parent
8f5e8b4359
commit
608eba4889
@ -1022,8 +1022,9 @@ join_file (file, srcfiles, vers, update_dir, entries)
|
||||
}
|
||||
}
|
||||
|
||||
/* skip joining identical revs */
|
||||
if (strcmp (rev2, vers->vn_user) == 0) /* no merge necessary */
|
||||
/* skip joining identical revs or if the file is not present */
|
||||
if (vers->vn_user == NULL ||
|
||||
strcmp (rev2, vers->vn_user) == 0) /* no merge necessary */
|
||||
{
|
||||
free (rev2);
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user