RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix coverity CID 350569

Browse source
This commit is contained in:
iceman1001 2021-07-05 17:14:47 +02:00
parent b026fc64f0
commit b0c1ce714f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/src/proxguiqt.cpp
View file

@ -105,8 +105,13 @@ void ProxGuiQT::_HideGraphWindow(void) {
// picture viewer // picture viewer
void ProxGuiQT::_ShowPictureWindow(char *fn) { void ProxGuiQT::_ShowPictureWindow(char *fn) {
if (!plotapp)
return;
if (fn == NULL) if (fn == NULL)
return; return;
size_t slen = strlen(fn); size_t slen = strlen(fn);
if (slen == 0) if (slen == 0)
return; return;
@ -117,9 +122,6 @@ void ProxGuiQT::_ShowPictureWindow(char *fn) {
memcpy(myfn, fn, slen); memcpy(myfn, fn, slen);
if (!plotapp)
return;
if (!pictureWidget) { if (!pictureWidget) {
#if defined(__MACH__) && defined(__APPLE__) #if defined(__MACH__) && defined(__APPLE__)
@ -191,11 +193,6 @@ void ProxGuiQT::_StartProxmarkThread(void) {
void ProxGuiQT::MainLoop() { void ProxGuiQT::MainLoop() {
plotapp = new QApplication(argc, argv); plotapp = new QApplication(argc, argv);
// Setup the picture widget
pictureWidget = new QWidget();
pictureController = new Ui::PictureForm();
pictureController->setupUi(pictureWidget);
connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow())); connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow()));
connect(this, SIGNAL(RepaintGraphWindowSignal()), this, SLOT(_RepaintGraphWindow())); connect(this, SIGNAL(RepaintGraphWindowSignal()), this, SLOT(_RepaintGraphWindow()));
connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow())); connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
@ -222,6 +219,11 @@ void ProxGuiQT::MainLoop() {
ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL), ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
argc(argc), argv(argv), proxmarkThread(wthread) { argc(argc), argv(argv), proxmarkThread(wthread) {
// Setup the picture widget
pictureWidget = new QWidget();
pictureController = new Ui::PictureForm();
pictureController->setupUi(pictureWidget);
} }
ProxGuiQT::~ProxGuiQT(void) { ProxGuiQT::~ProxGuiQT(void) {