diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-03-12 11:36:58 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-03-12 11:36:58 -0700 |
| commit | cb56923ba6350cf7441260886f6e8a1c6785886d (patch) | |
| tree | 3b01ff354824633006b0124252faabf083877036 /core/java/android/hardware/Camera.java | |
| parent | c4ffe77a710880416a7cf7c20277311bab2d7abc (diff) | |
| download | frameworks_base-cb56923ba6350cf7441260886f6e8a1c6785886d.zip frameworks_base-cb56923ba6350cf7441260886f6e8a1c6785886d.tar.gz frameworks_base-cb56923ba6350cf7441260886f6e8a1c6785886d.tar.bz2 | |
Check for null characters being used in camera parameters.
Change-Id: I258bce0fcadaec15e495e3303d3d7a952b72b4b5
Diffstat (limited to 'core/java/android/hardware/Camera.java')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 2775c7b..fbcbb32 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1907,12 +1907,12 @@ public class Camera { * @param value the String value of the parameter */ public void set(String key, String value) { - if (key.indexOf('=') != -1 || key.indexOf(';') != -1) { - Log.e(TAG, "Key \"" + key + "\" contains invalid character (= or ;)"); + if (key.indexOf('=') != -1 || key.indexOf(';') != -1 || key.indexOf(0) != -1) { + Log.e(TAG, "Key \"" + key + "\" contains invalid character (= or ; or \\0)"); return; } - if (value.indexOf('=') != -1 || value.indexOf(';') != -1) { - Log.e(TAG, "Value \"" + value + "\" contains invalid character (= or ;)"); + if (value.indexOf('=') != -1 || value.indexOf(';') != -1 || value.indexOf(0) != -1) { + Log.e(TAG, "Value \"" + value + "\" contains invalid character (= or ; or \\0)"); return; } |