summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-25 01:47:47 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-25 01:47:47 +0000
commite4abfd3d9e2bb728360557001d29b6402c5796cf (patch)
tree5271d0b3f53921d2a275a041fa09c9acc835db98
parent8812b64b3c165c3ab1e2388e2907669e42c042a8 (diff)
downloadruby-e4abfd3d9e2bb728360557001d29b6402c5796cf.tar.gz
ruby-e4abfd3d9e2bb728360557001d29b6402c5796cf.tar.xz
ruby-e4abfd3d9e2bb728360557001d29b6402c5796cf.zip
* win32/win32.c (isInternalCmd): check return value of NtMakeCmdVector (Tietew <tietew@tietew.net>'s patch).
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c26
2 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 34933ec74..c087dce9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 25 10:46:42 2001 Usaku Nakamura <usa@ruby-lang.org>
+
+ * win32/win32.c (isInternalCmd): check return value of NtMakeCmdVector
+ (Tietew <tietew@tietew.net>'s patch).
+
Thu Sep 20 21:25:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* eval.c (MATCH_DATA): access via rb_svar().
diff --git a/win32/win32.c b/win32/win32.c
index 52c361d27..53c7c2246 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -367,20 +367,22 @@ static char *szInternalCmds[] = {
int
isInternalCmd(char *cmd)
{
- int i, fRet=0;
- char **vec;
- int vecc = NtMakeCmdVector(cmd, &vec, FALSE);
+ int i, fRet=0;
+ char **vec;
+ int vecc = NtMakeCmdVector(cmd, &vec, FALSE);
- for( i = 0; szInternalCmds[i] ; i++){
- if(!strcasecmp(szInternalCmds[i], vec[0])){
- fRet = 1;
- break;
- }
- }
-
- SafeFree (vec, vecc);
+ if (vecc == 0)
+ return 0;
+ for( i = 0; szInternalCmds[i] ; i++){
+ if(!strcasecmp(szInternalCmds[i], vec[0])){
+ fRet = 1;
+ break;
+ }
+ }
+
+ SafeFree(vec, vecc);
- return fRet;
+ return fRet;
}