Fix NPE in NdefRecord parser.

Martijn Coenen · Martijn Coenen · commit 32ac1e142c4a · 2012-09-06T17:13:38.000+02:00
Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
@@ -688,7 +688,8 @@ private Uri toUri(boolean inSmartPoster) {
                         }
                     } catch (FormatException e) {  }
                 } else if (Arrays.equals(mType, RTD_URI)) {
-                    return parseWktUri().normalizeScheme();
+                    Uri wktUri = parseWktUri();
+                    return (wktUri != null ? wktUri.normalizeScheme() : null);
                 }
                 break;
 

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,8 @@ private Uri toUri(boolean inSmartPoster) {`
`688`	`688`	`}`
`689`	`689`	`} catch (FormatException e) { }`
`690`	`690`	`} else if (Arrays.equals(mType, RTD_URI)) {`
`691`		`- return parseWktUri().normalizeScheme();`
	`691`	`+ Uri wktUri = parseWktUri();`
	`692`	`+ return (wktUri != null ? wktUri.normalizeScheme() : null);`
`692`	`693`	`}`
`693`	`694`	`break;`
`694`	`695`