From a1ed9cdb397468e428c81342cd99c547352e8f57 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Wed, 4 Jul 2018 10:49:47 -0400
Subject: [PATCH] Bug 536396 - Handle corrupt scanner info cache files

We were not handling JSON parse errors when loading the scanner info
cache files which causes havoc at index time.

Change-Id: I3a4ee6424134fe756543e4429e9e97b911cda99e
---
 .../src/org/eclipse/cdt/core/build/CBuildConfiguration.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index bc2e24cd2e7..7adcdb15611 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -701,7 +701,7 @@ public abstract class CBuildConfiguration extends PlatformObject
 								new IExtendedScannerInfoCreator());
 						Gson gson = gsonBuilder.create();
 						scannerInfoCache = gson.fromJson(reader, ScannerInfoCache.class);
-					} catch (IOException e) {
+					} catch (IOException | JsonParseException e) {
 						CCorePlugin.log(e);
 						scannerInfoCache = new ScannerInfoCache();
 					}