# HG changeset patch # User Ed Swartz # Date 1264693606 21600 # Node ID eb9903eb53520e1dcdb4574aac87e0d9a59b5edf # Parent ba25abd590600d5586d1207fe2cfad016f506ea9 Fix crash when environment contains non-standard variable settings diff -r ba25abd59060 -r eb9903eb5352 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Tue Jan 26 14:36:17 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Thu Jan 28 09:46:46 2010 -0600 @@ -461,8 +461,11 @@ private Map stringArrayToMap(String[] array) { Map map = new HashMap(array.length); for (String var : array) { - String[] split = var.split("="); - map.put(split[0], split[1]); + int idx = var.indexOf('='); + if (idx > 0) + map.put(var.substring(0, idx), var.substring(idx+1)); + else if (var.length() > 0) + map.put(var, ""); } return map;