From: Siddhartha Gairola <siddhartha.gairola18@gmail.com>
Date: Wed, 18 Jan 2017 17:23:53 +0000 (+0530)
Subject: CID #1098686, #1098693 Fixed
X-Git-Tag: 6.1.0~917
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=c2527825156a9a8b35df10a4f3951a2d0a2756ab

CID #1098686, #1098693 Fixed

Change-Id: I10ecd8262e4097eac64743d57ba0ead4c81b256e
---

diff --git a/scilab/modules/gui/sci_gateway/c/sci_mpopup.c b/scilab/modules/gui/sci_gateway/c/sci_mpopup.c
index d3da824..103e6a0 100644
--- a/scilab/modules/gui/sci_gateway/c/sci_mpopup.c
+++ b/scilab/modules/gui/sci_gateway/c/sci_mpopup.c
@@ -99,6 +99,7 @@ int sci_mpopup(char *fname, void* pvApiCtx)
     pstRes = uiWaitContextMenu(iUicontextmenuUID);
 
     iRet = createSingleString(pvApiCtx, nbInputArgument(pvApiCtx) + 1, pstRes);
+    FREE(pstRes);
     if (iRet)
     {
         freeAllocatedMatrixOfString(iRows, iCols, pstAllMenuLabels);
diff --git a/scilab/modules/gui/sci_gateway/cpp/sci_uigetfont.cpp b/scilab/modules/gui/sci_gateway/cpp/sci_uigetfont.cpp
index 46cfed9..3aa49ce 100644
--- a/scilab/modules/gui/sci_gateway/cpp/sci_uigetfont.cpp
+++ b/scilab/modules/gui/sci_gateway/cpp/sci_uigetfont.cpp
@@ -248,6 +248,7 @@ int sci_uigetfont(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedFontName;
                 return 1;
             }
         }