hanyixuanten/vscode-cpptools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More guards against crashes in configuration processing (#1702)

Browse Source
This commit is contained in:
Bob Brown
2018-03-19 15:58:25 -07:00
committed by GitHub
parent c68ad37d98
commit 905041068f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extension/src/LanguageServer/configurations.ts
+3 -2
View File
@@ -424,10 +424,11 @@ export class CppProperties {
// Try to use the same configuration as before the change.
let newJson: ConfigurationJson = JSON.parse(readResults);
if (newJson.configurations.length === 0) {
if (!newJson || !newJson.configurations || newJson.configurations.length === 0) {
throw { message: "Invalid configuration file. There must be at least one configuration present in the array." };
}
if (!this.configurationIncomplete && newJson.configurations && this.configurationJson) {
if (!this.configurationIncomplete && this.configurationJson && this.configurationJson.configurations &&
this.CurrentConfiguration < this.configurationJson.configurations.length) {
for (let i: number = 0; i < newJson.configurations.length; i++) {
if (newJson.configurations[i].name === this.configurationJson.configurations[this.CurrentConfiguration].name) {
this.currentConfigurationIndex.Value = i;