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

Commit 6345b426 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "Closing the stream when the function returns" into main am: 9d1db844 am: b45cc9f3 

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



Change-Id: I89075ba9bd555447ff804c950acc70190b8982b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66f4b829 b45cc9f3

sethostent.cpp

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) { 
    char* aliases[MAXALIASES];

    char* addr_ptrs[MAXADDRS];



    // TODO: Wrap the 'hf' into a RAII class or std::shared_ptr and modify the

    // sethostent_r()/endhostent_r() to get rid of manually endhostent_r(&hf) everywhere.

    FILE* hf = NULL;

    sethostent_r(&hf);

    if (hf == NULL) {
@@ -80,6 +82,7 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) { 
    }



    if ((ptr = buf = (char*) malloc(len = info->buflen)) == NULL) {

        endhostent_r(&hf);

        return EAI_MEMORY;

    }
@@ -103,6 +106,7 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) { 


        if (hp->h_name == nullptr) {

            free(buf);

            endhostent_r(&hf);

            return EAI_FAIL;

        }

        const char* h_name = hp->h_name;
@@ -131,6 +135,7 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) { 
        if (num >= MAXADDRS) goto nospc;

        if (hp->h_addr_list[0] == nullptr) {

            free(buf);

            endhostent_r(&hf);

            return EAI_FAIL;

        }

        const char* addr = hp->h_addr_list[0];
@@ -185,6 +190,7 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) { 
    free(buf);

    return 0;

nospc:

    endhostent_r(&hf);

    free(buf);

    return EAI_MEMORY;

}