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

Commit c734143c authored by Wei Wang's avatar Wei Wang
Browse files

Fix log function for potential overflow 

On LP64 system, unsigned long can be 64bit
Also clean out unused static variables.

Test: flash on ARM64 device
Bug: 32181382
Change-Id: I44b7ea8a6588c475a3979d7bddeb08da7f54c27a
parent 8fee4017

include/binder/TextOutput.h

+13 −28
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <stdint.h>

#include <string.h>

#include <sstream>



// ---------------------------------------------------------------------------

namespace android {
@@ -66,21 +67,17 @@ TextOutput& endl(TextOutput& to); 
TextOutput& indent(TextOutput& to);

TextOutput& dedent(TextOutput& to);



TextOutput& operator<<(TextOutput& to, const char* str);

TextOutput& operator<<(TextOutput& to, char);     // writes raw character

TextOutput& operator<<(TextOutput& to, bool);

TextOutput& operator<<(TextOutput& to, int);

TextOutput& operator<<(TextOutput& to, long);

TextOutput& operator<<(TextOutput& to, unsigned int);

TextOutput& operator<<(TextOutput& to, unsigned long);

TextOutput& operator<<(TextOutput& to, long long);

TextOutput& operator<<(TextOutput& to, unsigned long long);

TextOutput& operator<<(TextOutput& to, float);

TextOutput& operator<<(TextOutput& to, double);

template<typename T>

TextOutput& operator<<(TextOutput& to, const T& val)

{

    std::stringstream strbuf;

    strbuf << val;

    std::string str = strbuf.str();

    to.print(str.c_str(), str.size());

    return to;

}



TextOutput& operator<<(TextOutput& to, TextOutputManipFunc func);

TextOutput& operator<<(TextOutput& to, const void*);

TextOutput& operator<<(TextOutput& to, const String8& val);

TextOutput& operator<<(TextOutput& to, const String16& val);



class TypeCode

{
@@ -146,18 +143,6 @@ inline TextOutput& dedent(TextOutput& to) 
    return to;

}



inline TextOutput& operator<<(TextOutput& to, const char* str)

{

    to.print(str, strlen(str));

    return to;

}



inline TextOutput& operator<<(TextOutput& to, char c)

{

    to.print(&c, 1);

    return to;

}



inline TextOutput& operator<<(TextOutput& to, TextOutputManipFunc func)

{

    return (*func)(to);

libs/binder/IPCThreadState.cpp

+2 −6
Original line number Diff line number Diff line
@@ -64,10 +64,6 @@ 


namespace android {



static const char* getReturnString(size_t idx);

static const void* printReturnCommand(TextOutput& out, const void* _cmd);

static const void* printCommand(TextOutput& out, const void* _cmd);



// Static const and functions will be optimized out if not used,

// when LOG_NDEBUG and references in IF_LOG_COMMANDS() are optimized out.

static const char *kReturnStrings[] = {
@@ -526,8 +522,8 @@ void IPCThreadState::joinThreadPool(bool isMain) 
        }

    } while (result != -ECONNREFUSED && result != -EBADF);



    LOG_THREADPOOL("**** THREAD %p (PID %d) IS LEAVING THE THREAD POOL err=%p\n",

        (void*)pthread_self(), getpid(), (void*)result);

    LOG_THREADPOOL("**** THREAD %p (PID %d) IS LEAVING THE THREAD POOL err=%d\n",

        (void*)pthread_self(), getpid(), result);

    

    mOut.writeInt32(BC_EXIT_LOOPER);

    talkWithDriver(false);

libs/binder/TextOutput.cpp

+2 −99
Original line number Diff line number Diff line
@@ -37,103 +37,6 @@ TextOutput::~TextOutput() { 


// ---------------------------------------------------------------------------



TextOutput& operator<<(TextOutput& to, bool val)

{

    if (val) to.print("true", 4);

    else to.print("false", 5);

    return to;

}



TextOutput& operator<<(TextOutput& to, int val)

{

    char buf[16];

    sprintf(buf, "%d", val);

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, long val)

{

    char buf[16];

    sprintf(buf, "%ld", val);

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, unsigned int val)

{

    char buf[16];

    sprintf(buf, "%u", val);

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, unsigned long val)

{

    char buf[16];

    sprintf(buf, "%lu", val);

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, long long val)

{

    char buf[32];

    sprintf(buf, "%Ld", val);

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, unsigned long long val)

{

    char buf[32];

    sprintf(buf, "%Lu", val);

    to.print(buf, strlen(buf));

    return to;

}



static TextOutput& print_float(TextOutput& to, double value)

{

    char buf[64];

    sprintf(buf, "%g", value);

    if( !strchr(buf, '.') && !strchr(buf, 'e') &&

        !strchr(buf, 'E') ) {

        strncat(buf, ".0", sizeof(buf)-1);

    }

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, float val)

{

    return print_float(to,val);

}



TextOutput& operator<<(TextOutput& to, double val)

{

    return print_float(to,val);

}



TextOutput& operator<<(TextOutput& to, const void* val)

{

    char buf[32];

    snprintf(buf, sizeof(buf), "%p", val);

    to.print(buf, strlen(buf));

    return to;

}



TextOutput& operator<<(TextOutput& to, const String8& val)

{

    to << val.string();

    return to;

}



TextOutput& operator<<(TextOutput& to, const String16& val)

{

    to << String8(val).string();

    return to;

}



static void textOutputPrinter(void* cookie, const char* txt)

{

    ((TextOutput*)cookie)->print(txt, strlen(txt));