bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check parameters of ShellToDos() and Unpack(). Bugreport from Semen Panevin 2:5025/121

Browse Source
This commit is contained in:
Stas Degteff 2011-02-22 15:44:34 +00:00
parent 841f70e850
commit 3ec43ed652
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
golded3/gedoss.cpp
View File

@ -36,6 +36,7 @@
#include <windows.h> #include <windows.h>
extern OSVERSIONINFO WinVer; extern OSVERSIONINFO WinVer;
#endif #endif
#include <gdbgerr.h>
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -211,7 +212,7 @@ void Cleanup(void) {
// Back to default Ctrl-Break handler // Back to default Ctrl-Break handler
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
} } // Cleanup()
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -219,6 +220,21 @@ void Cleanup(void) {
int ShellToDos(const char* command, char* message, vattr cls, int cursor, int pause) { int ShellToDos(const char* command, char* message, vattr cls, int cursor, int pause) {
if ( !(command && message) ) {
LOG.errpointer(__FILE__,__LINE__-3);
LOG.printf("! Parameter is NULL pointer: ShellToDos(\"%s\",\"%s\").",
command?command:"(NULL)", message?message:"(NULL)");
update_statusline(" ERROR! See log. ");
return 0;
}
if ( !(*command) ) {
LOG.errtest(__FILE__,__LINE__-8);
LOG.printf("! ShellToDos(): command is empty, message is: \"%s\"", message);
update_statusline("ERROR: Command is empty, can't run!");
return 0;
}
int error = 0; int error = 0;
#if defined(GUTLOS_FUNCS) #if defined(GUTLOS_FUNCS)
@ -478,13 +494,27 @@ int ShellToDos(const char* command, char* message, vattr cls, int cursor, int pa
#endif #endif
return status; return status;
} } // ShellToDos()
// ------------------------------------------------------------------ // ------------------------------------------------------------------
const char* Unpack(const char* archive) { const char* Unpack(const char* archive) {
if ( !archive ) {
LOG.errpointer(__FILE__,__LINE__-3);
LOG.printf("! Parameter is NULL pointer: Unpack(NULL).");
update_statusline(" ERROR! See log. ");
return NULL;
}
if ( ! *archive ) {
LOG.errtest(__FILE__,__LINE__-8);
LOG.printf("! Unpack(): archive file name is empty.");
update_statusline(" ERROR: archive file name is empty ");
return NULL;
}
static Path newname; static Path newname;
const char *filename = CleanFilename(archive); const char *filename = CleanFilename(archive);
@ -526,7 +556,7 @@ const char* Unpack(const char* archive) {
} }
return NULL; return NULL;
} } // Unpack()
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -562,7 +592,7 @@ void CleanUnpacked(const char* unpacked) {
remove(removeme.c_str()); remove(removeme.c_str());
} }
rmdir(tmpdir); rmdir(tmpdir);
} } // CleanUnpacked()
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Error exit function // Error exit function
@ -601,7 +631,7 @@ void ErrorExit(int type) {
exit(EXIT_OK); exit(EXIT_OK);
} }
} } // ErrorExit()
// ------------------------------------------------------------------ // ------------------------------------------------------------------