[cvsnt] I got core at import

NAKAMURA, Takeshi 1yen at sh.rim.or.jp
Fri Oct 27 06:22:39 BST 2006


Hi

I got core at import.
> cd /tmp
> mkdir repositopry
> mkdir Z
> cd Z
> touch H
> cvsnt -d /tmp/repository init
cvsnt init: Unable to register repository.
cvsnt init: Your login may not have sufficient permissions to modify the
cvsnt init: global server settings.
cvsnt init: Repository /tmp/repository initialised
> cvsnt -d /tmp/repository import -m test Hz VTag RelTag
N Hz/H

No conflicts created by this import

> echo ZZZ > H
> cvsnt -d /tmp/repository import -m test -n Hz
Segmentation fault (core dumped)
Exit 139
>uname -smr
FreeBSD 5.5-RELEASE-p7 i386
> cvsnt -v

Concurrent Versions System (CVSNT) 2.5.02 (Servalan) Build 2115 (client/server)
...


please check this patch
% diff -u src/import.cpp.orig src/import.cpp
--- src/import.cpp.orig Fri Oct 27 13:59:29 2006
+++ src/import.cpp      Fri Oct 27 14:00:59 2006
@@ -768,7 +768,8 @@
                return (1);
     }

-    if (vers->srcfile->branch == NULL || strcmp (vers->srcfile->branch, vbranch) != 0)
+    if ((vers->srcfile->branch == NULL || vbranch == NULL)
+               || strcmp (vers->srcfile->branch, vbranch) != 0)
     {
                conflicts++;
                letter = 'C';

----+----1----+----2----+----3----+----4----+----5----+----6----+
 NAKAMURA Takeshi <1yen at sh.rim.or.jp>
 I have poor english.



More information about the cvsnt mailing list