zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-15 16:13:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[pykd_ext_2.0] fixed : issue # 14104 ( !py command crashes if a script does not exist )

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@91233 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\ussrhero_cp 2017-05-15 21:49:47 +00:00 committed by Mikhail I. Izmestev
parent 7fc08bcadd
commit 61bf1b83d0
2 changed files with 74 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pykd_ext/version.h
View File

@ -3,7 +3,7 @@
#define PYKDEXT_VERSION_MAJOR 2 #define PYKDEXT_VERSION_MAJOR 2
#define PYKDEXT_VERSION_MINOR 0 #define PYKDEXT_VERSION_MINOR 0
#define PYKDEXT_VERSION_SUBVERSION 0 #define PYKDEXT_VERSION_SUBVERSION 0
#define PYKDEXT_VERSION_BUILDNO 12 #define PYKDEXT_VERSION_BUILDNO 13
#define __VER_STR2__(x) #x #define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x) #define __VER_STR1__(x) __VER_STR2__(x)

96
pykd_ext/windbgext.cpp
View File

@ -382,8 +382,6 @@ py(
else else
{ {
std::string scriptFileName = getScriptFileName(opts.args[0]); std::string scriptFileName = getScriptFileName(opts.args[0]);
if (scriptFileName.empty())
throw std::invalid_argument("script not found\n");
if (IsPy3()) if (IsPy3())
{ {
@ -567,21 +565,52 @@ void handleException()
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
std::string findScript(const std::string &fullFileName) void getPathList( std::list<std::string> &pathStringLst)
{ {
if (GetFileAttributesA(fullFileName.c_str()) != INVALID_FILE_ATTRIBUTES)
return fullFileName;
PyObjectBorrowedRef pathLst = PySys_GetObject("path"); PyObjectBorrowedRef pathLst = PySys_GetObject("path");
size_t pathLstSize = PyList_Size(pathLst); size_t pathLstSize = PyList_Size(pathLst);
for (size_t i = 0; i < pathLstSize; i++) for (size_t i = 0; i < pathLstSize; i++)
{ {
char *path = PyString_AsString(PyList_GetItem(pathLst, i)); PyObjectBorrowedRef pathLstItem = PyList_GetItem(pathLst, i);
if ( IsPy3() )
{
std::vector<wchar_t> buf(0x10000);
size_t len = buf.size();
PyUnicode_AsWideChar(pathLstItem, &buf[0], len);
DWORD attr = GetFileAttributesW(&buf[0]);
if ( attr == INVALID_FILE_ATTRIBUTES || (attr & FILE_ATTRIBUTE_DIRECTORY ) == 0 )
continue;
pathStringLst.push_back( std::string(_bstr_t(&buf[0])));
}
else
{
char* path = PyString_AsString(pathLstItem);
DWORD attr = GetFileAttributesA(path);
if ( attr == INVALID_FILE_ATTRIBUTES || (attr & FILE_ATTRIBUTE_DIRECTORY ) == 0 )
continue;
pathStringLst.push_back(path);
}
}
}
///////////////////////////////////////////////////////////////////////////////
std::string findScriptPath(const std::string &fullFileName)
{
std::list<std::string> pathList;
getPathList(pathList);
for ( auto path : pathList )
{
DWORD bufSize = SearchPathA( DWORD bufSize = SearchPathA(
path, path.c_str(),
fullFileName.c_str(), fullFileName.c_str(),
NULL, NULL,
0, 0,
@ -595,7 +624,7 @@ std::string findScript(const std::string &fullFileName)
char *partFileNameCStr = NULL; char *partFileNameCStr = NULL;
bufSize = SearchPathA( bufSize = SearchPathA(
path, path.c_str(),
fullFileName.c_str(), fullFileName.c_str(),
NULL, NULL,
bufSize, bufSize,
@ -607,32 +636,53 @@ std::string findScript(const std::string &fullFileName)
if ((fileAttr & FILE_ATTRIBUTE_DIRECTORY) == 0) if ((fileAttr & FILE_ATTRIBUTE_DIRECTORY) == 0)
return std::string(&fullFileNameCStr[0]); return std::string(&fullFileNameCStr[0]);
} }
} }
return ""; std::stringstream sstr;
sstr << "script not found" << std::endl << std::endl;
if ( pathList.empty() )
{
sstr << "Path list: empty" << std::endl;
}
else
{
sstr << "Path list:" << std::endl;
for ( auto path : pathList )
{
sstr << '\t' << path << std::endl;
}
}
throw std::invalid_argument(sstr.str().c_str());
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
std::string getScriptFileName(const std::string &scriptName) std::string getScriptFileName(const std::string &scriptName)
{ {
std::string scriptFileName = findScript(scriptName);
if (scriptFileName.empty()) if ( scriptName.find('\\') != std::string::npos || scriptName.find('/') != std::string::npos )
{ {
std::string scriptNameLow; if (GetFileAttributesA(scriptName.c_str()) != INVALID_FILE_ATTRIBUTES)
scriptNameLow.resize(scriptName.size()); return scriptName;
std::transform(
scriptName.begin(), std::stringstream sstr;
scriptName.end(),
scriptNameLow.begin(), sstr << "File \'" << scriptName << "\' not found" << std::endl;
::tolower);
if (scriptNameLow.rfind(".py") != (scriptNameLow.length() - 3)) throw std::invalid_argument(sstr.str().c_str());
scriptFileName = findScript(scriptName + ".py");
} }
return scriptFileName; try {
return findScriptPath(scriptName);
}
catch( std::invalid_argument& )
{}
return findScriptPath(scriptName + ".py");
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////