moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-09 20:58:05 -05:00
Code Issues Releases Wiki Activity

From coverity: avoid null dereference in VProperty

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2278 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2014-03-19 22:39:26 +00:00
parent d960fd65ec
commit abf481b39e
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/java/davmail/exchange/VProperty.java
View File

@ -120,28 +120,28 @@ public class VProperty {
startIndex = i + 1; startIndex = i + 1;
} else if (currentChar == ':') { } else if (currentChar == ':') {
if (startIndex < i) { if (startIndex < i) {
paramValues.add(line.substring(startIndex, i)); paramValues = addParamValue(paramValues, line.substring(startIndex, i));
} }
addParam(paramName, paramValues); addParam(paramName, paramValues);
state = State.VALUE; state = State.VALUE;
startIndex = i + 1; startIndex = i + 1;
} else if (currentChar == ';') { } else if (currentChar == ';') {
if (startIndex < i) { if (startIndex < i) {
paramValues.add(line.substring(startIndex, i)); paramValues = addParamValue(paramValues, line.substring(startIndex, i));
} }
addParam(paramName, paramValues); addParam(paramName, paramValues);
state = State.PARAM_NAME; state = State.PARAM_NAME;
startIndex = i + 1; startIndex = i + 1;
} else if (currentChar == ',') { } else if (currentChar == ',') {
if (startIndex < i) { if (startIndex < i) {
paramValues.add(line.substring(startIndex, i)); paramValues = addParamValue(paramValues, line.substring(startIndex, i));
} }
startIndex = i + 1; startIndex = i + 1;
} }
} else if (state == State.QUOTED_PARAM_VALUE) { } else if (state == State.QUOTED_PARAM_VALUE) {
if (currentChar == '"') { if (currentChar == '"') {
state = State.PARAM_VALUE; state = State.PARAM_VALUE;
paramValues.add(line.substring(startIndex, i)); paramValues = addParamValue(paramValues, line.substring(startIndex, i));
startIndex = i + 1; startIndex = i + 1;
} }
} else if (state == State.VALUE) { } else if (state == State.VALUE) {
@ -238,6 +238,22 @@ public class VProperty {
return false; return false;
} }
/**
* Add value to paramValues and return list, create list if null.
*
* @param paramValues value list
* @param value new value
* @return updated value list
*/
protected List<String> addParamValue(List<String> paramValues, String value) {
List<String> result = paramValues;
if (result == null) {
result = new ArrayList<String>();
}
result.add(value);
return result;
}
protected void addParam(String paramName) { protected void addParam(String paramName) {
addParam(paramName, (String) null); addParam(paramName, (String) null);
} }
@ -282,7 +298,7 @@ public class VProperty {
} }
protected Param getParam(String paramName) { protected Param getParam(String paramName) {
if (params != null) { if (params != null && paramName != null) {
for (Param param : params) { for (Param param : params) {
if (paramName.equals(param.name)) { if (paramName.equals(param.name)) {
return param; return param;
@ -456,3 +472,4 @@ public class VProperty {
} }
} }