Files
kicad-source-mirror/common/git/project_git_utils.cpp
T
Seth Hillbrand 508bb36f8b Fix null dereference in PROJECT_GIT_UTILS
In CLI mode, SetGitBackend() is never called so GetGitBackend() returns
nullptr. GetRepositoryForFile(), CreateBranch(), and RemoveVCS() all
called GetGitBackend()->method() unconditionally, causing a SIGSEGV when
a schematic containing ${VCSHASH} or ${VCSSHORTHASH} text variables is
loaded via kicad-cli jobset run.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/23214
2026-03-02 08:03:53 -08:00

179 lines
5.2 KiB
C++

/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright The KiCad Developers, see AUTHORS.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/gpl-3.0.html
* or you may search the http://www.gnu.org website for the version 3 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "project_git_utils.h"
#include "git_backend.h"
#include <wx/filename.h>
#include <wx/string.h>
#include <string_utils.h>
#ifndef __WINDOWS__
#include <climits>
#include <cstdlib>
#endif
namespace KIGIT
{
git_repository* PROJECT_GIT_UTILS::GetRepositoryForFile( const char* aFilename )
{
GIT_BACKEND* backend = GetGitBackend();
if( !backend )
return nullptr;
return backend->GetRepositoryForFile( aFilename );
}
int PROJECT_GIT_UTILS::CreateBranch( git_repository* aRepo, const wxString& aBranchName )
{
GIT_BACKEND* backend = GetGitBackend();
if( !backend )
return -1;
return backend->CreateBranch( aRepo, aBranchName );
}
bool PROJECT_GIT_UTILS::RemoveVCS( git_repository*& aRepo, const wxString& aProjectPath,
bool aRemoveGitDir, wxString* aErrors )
{
GIT_BACKEND* backend = GetGitBackend();
if( !backend )
return false;
return backend->RemoveVCS( aRepo, aProjectPath, aRemoveGitDir, aErrors );
}
wxString PROJECT_GIT_UTILS::GetCurrentHash( const wxString& aProjectFile, bool aShort )
{
wxString result = wxT( "no hash" );
git_repository* repo = PROJECT_GIT_UTILS::GetRepositoryForFile( TO_UTF8( aProjectFile ) );
if( repo )
{
git_reference* head = nullptr;
if( git_repository_head( &head, repo ) == 0 )
{
const git_oid* oid = git_reference_target( head );
if( oid )
{
char buf[GIT_OID_HEXSZ + 1];
size_t len = aShort ? 9 : GIT_OID_HEXSZ + 1; // 8 chars + null terminator
git_oid_tostr( buf, len, oid );
result = wxString::FromUTF8( buf );
}
git_reference_free( head );
}
git_repository_free( repo );
}
return result;
}
wxString PROJECT_GIT_UTILS::ComputeSymlinkPreservingWorkDir( const wxString& aUserProjectPath,
const wxString& aCanonicalWorkDir )
{
#ifdef __WINDOWS__
return aCanonicalWorkDir;
#else
if( aUserProjectPath.IsEmpty() || aCanonicalWorkDir.IsEmpty() )
return aCanonicalWorkDir;
char resolvedPath[PATH_MAX];
if( realpath( aUserProjectPath.mb_str(), resolvedPath ) == nullptr )
return aCanonicalWorkDir;
wxString canonicalUserPath = wxString::FromUTF8( resolvedPath );
if( !canonicalUserPath.EndsWith( wxFileName::GetPathSeparator() ) )
canonicalUserPath += wxFileName::GetPathSeparator();
wxString canonicalWorkDirNorm = aCanonicalWorkDir;
if( !canonicalWorkDirNorm.EndsWith( wxFileName::GetPathSeparator() ) )
canonicalWorkDirNorm += wxFileName::GetPathSeparator();
// The workdir could be at or above the project directory
if( canonicalUserPath.StartsWith( canonicalWorkDirNorm ) )
{
return aUserProjectPath.EndsWith( wxFileName::GetPathSeparator() )
? aUserProjectPath
: aUserProjectPath + wxFileName::GetPathSeparator();
}
// The workdir is above the user path - find the portion that corresponds to the workdir
wxFileName userFn( aUserProjectPath );
wxFileName workDirFn( aCanonicalWorkDir );
wxArrayString workDirParts = workDirFn.GetDirs();
size_t workDirDepth = workDirParts.GetCount();
wxFileName canonicalUserFn( canonicalUserPath );
wxArrayString canonicalUserParts = canonicalUserFn.GetDirs();
if( canonicalUserParts.GetCount() < workDirDepth )
return aCanonicalWorkDir;
wxArrayString canonicalWorkDirParts = workDirFn.GetDirs();
for( size_t i = 0; i < workDirDepth; ++i )
{
if( canonicalUserParts[i] != canonicalWorkDirParts[i] )
return aCanonicalWorkDir;
}
wxArrayString userParts = userFn.GetDirs();
if( userParts.GetCount() < workDirDepth )
return aCanonicalWorkDir;
wxString result = userFn.GetVolume();
if( !result.IsEmpty() )
result += wxFileName::GetVolumeSeparator();
result += wxFileName::GetPathSeparator();
for( size_t i = 0; i < workDirDepth; ++i )
{
result += userParts[i];
result += wxFileName::GetPathSeparator();
}
return result;
#endif
}
} // namespace KIGIT