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

Commit f364d1bb authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: Fix argument length checking in btclient" am: 893178e9 am: 648d2325 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2184583



Change-Id: I2d4aacad9284b8ed70192443ac3472d50d2e1dcf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86b70038 648d2325

system/gd/rust/linux/client/src/command_handler.rs

+5 −5
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ impl CommandHandler { 
                    );

                }

                "set-alias" => {

                    if args.len() < 3 {

                    if args.len() < 4 {

                        println!("usage: device set-alias <address> <new-alias>");

                        return;

                    }
@@ -660,7 +660,7 @@ impl CommandHandler { 
                );

            }

            "client-connect" => {

                if args.len() < 2 {

                if args.len() < 3 {

                    println!("usage: gatt client-connect <addr>");

                    return;

                }
@@ -703,7 +703,7 @@ impl CommandHandler { 
                    .client_disconnect(client_id.unwrap(), addr);

            }

            "client-read-phy" => {

                if args.len() < 2 {

                if args.len() < 3 {

                    println!("usage: gatt client-read-phy <addr>");

                    return;

                }
@@ -724,7 +724,7 @@ impl CommandHandler { 
                    .client_read_phy(client_id.unwrap(), addr);

            }

            "client-discover-services" => {

                if args.len() < 2 {

                if args.len() < 3 {

                    println!("usage: gatt client-discover-services <addr>");

                    return;

                }
@@ -798,7 +798,7 @@ impl CommandHandler { 
                }

            }

            "unregister-scanner" => {

                if args.len() < 2 {

                if args.len() < 3 {

                    println!("usage: le-scan unregister-scanner <scanner-id>");

                    return;

                }