Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 586d365e authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Check for null characters being used in camera parameters."

parents 41efc447 cb56923b

core/java/android/hardware/Camera.java

+4 −4
Original line number Diff line number Diff line
@@ -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;

            }