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

Commit 2ba8c4b0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Ignore nullptr in native_handle_close()."

parents 47cdf6c0 7e424846

libcutils/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -197,7 +197,10 @@ cc_library { 


cc_defaults {

    name: "libcutils_test_default",

    srcs: ["sockets_test.cpp"],

    srcs: [

        "native_handle_test.cpp",

        "sockets_test.cpp",

    ],



    target: {

        android: {

libcutils/native_handle.cpp

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ int native_handle_delete(native_handle_t* h) { 
}



int native_handle_close(const native_handle_t* h) {

    if (!h) return 0;



    if (h->version != sizeof(native_handle_t)) return -EINVAL;



    int saved_errno = errno;

libcutils/native_handle_test.cpp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <cutils/native_handle.h>



#include <gtest/gtest.h>



TEST(native_handle, native_handle_delete) {

    ASSERT_EQ(0, native_handle_delete(nullptr));

}



TEST(native_handle, native_handle_close) {

    ASSERT_EQ(0, native_handle_close(nullptr));

}