1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00

Bug 491972 - [winpty] Not enough storage is available to process this command

This commit is contained in:
Anton Leherbauer 2016-04-19 11:59:43 +02:00
parent 4ad7f81c23
commit 10ba077124
7 changed files with 10 additions and 10 deletions

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName.win32 Bundle-Name: %fragmentName.win32
Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true
Bundle-Version: 5.4.0.qualifier Bundle-Version: 5.4.1.qualifier
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
Bundle-Localization: plugin Bundle-Localization: plugin

View file

@ -1,9 +1,9 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2013, 2014 Wind River Systems, Inc. and others. * Copyright (c) 2013, 2016 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Wind River Systems - initial API and implementation * Wind River Systems - initial API and implementation
@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYInputStream_read0
if (!ret || amount == 0) if (!ret || amount == 0)
amount = -1; amount = -1;
if (!ret) { if (!ret && fd2pty.find(fd) != fd2pty.end()) {
int rc = winpty_get_exit_code(winpty); int rc = winpty_get_exit_code(winpty);
fd2rc.insert(std::pair<int, int>(fd, rc)); fd2rc.insert(std::pair<int, int>(fd, rc));
} }
@ -173,11 +173,11 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYInputStream_close0(JNIE
fd2pty_Iter = fd2pty.find(fd); fd2pty_Iter = fd2pty.find(fd);
if (fd2pty_Iter != fd2pty.end()) { if (fd2pty_Iter != fd2pty.end()) {
winpty_t* winpty = fd2pty_Iter -> second; winpty_t* winpty = fd2pty_Iter -> second;
fd2pty.erase(fd2pty_Iter);
if (winpty != NULL) { if (winpty != NULL) {
winpty_close(winpty); winpty_close(winpty);
winpty = NULL; winpty = NULL;
} }
fd2pty.erase(fd2pty_Iter);
} }
return 0; return 0;
@ -241,11 +241,11 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYOutputStream_close0(JNI
fd2pty_Iter = fd2pty.find(fd); fd2pty_Iter = fd2pty.find(fd);
if (fd2pty_Iter != fd2pty.end()) { if (fd2pty_Iter != fd2pty.end()) {
winpty_t* winpty = fd2pty_Iter -> second; winpty_t* winpty = fd2pty_Iter -> second;
fd2pty.erase(fd2pty_Iter);
if (winpty != NULL) { if (winpty != NULL) {
winpty_close(winpty); winpty_close(winpty);
winpty = NULL; winpty = NULL;
} }
fd2pty.erase(fd2pty_Iter);
} }
return 0; return 0;

View file

@ -11,7 +11,7 @@
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<version>5.4.0-SNAPSHOT</version> <version>5.4.1-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.core.win32</artifactId> <artifactId>org.eclipse.cdt.core.win32</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>