From 1db1493a1b27d2049cd61bad15a37caffe4f7a61 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 30 Sep 2022 01:42:18 +0000 Subject: [PATCH] Fix wrong type size The data size of the Parcel is size_t. In 64-bit machine, the size of the size_t is 8 bytes. This patch changes the size type to the size_t from the interger. Change-Id: I6a9ccd057e3e7c26607a9703b5c189074911a660 oigned-off-by: Hwankyu Jhun --- src/client/pkginfo_client.cc | 2 +- src/server/create_cache_request.cc | 2 +- src/server/create_cache_request.hh | 2 +- src/server/pkg_request.cc | 2 +- src/server/pkg_request.hh | 4 ++-- src/server/request_handler/abstract_request_handler.hh | 2 +- src/server/request_handler/command_request_handler.cc | 2 +- src/server/request_handler/command_request_handler.hh | 2 +- src/server/request_handler/create_cache_request_handler.cc | 2 +- src/server/request_handler/create_cache_request_handler.hh | 2 +- src/server/request_handler/create_db_request_handler.cc | 2 +- src/server/request_handler/create_db_request_handler.hh | 2 +- src/server/request_handler/get_appinfo_request_handler.cc | 2 +- src/server/request_handler/get_appinfo_request_handler.hh | 2 +- src/server/request_handler/get_cert_request_handler.cc | 2 +- src/server/request_handler/get_cert_request_handler.hh | 2 +- src/server/request_handler/get_depinfo_request_handler.cc | 2 +- src/server/request_handler/get_depinfo_request_handler.hh | 2 +- src/server/request_handler/get_pkginfo_request_handler.cc | 2 +- src/server/request_handler/get_pkginfo_request_handler.hh | 2 +- src/server/request_handler/query_request_handler.cc | 2 +- src/server/request_handler/query_request_handler.hh | 2 +- src/server/request_handler/set_cert_request_handler.cc | 2 +- src/server/request_handler/set_cert_request_handler.hh | 2 +- src/server/request_handler/set_pkginfo_request_handler.cc | 2 +- src/server/request_handler/set_pkginfo_request_handler.hh | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/client/pkginfo_client.cc b/src/client/pkginfo_client.cc index c595f28..1ddf911 100644 --- a/src/client/pkginfo_client.cc +++ b/src/client/pkginfo_client.cc @@ -138,7 +138,7 @@ PkgInfoClient::GetResultParcel() { return nullptr; } - int len = 0; + size_t len = 0; if (socket_->ReceiveData(&len, sizeof(len)) != 0 || len <= 0) { LOG(ERROR) << "Fail to receive data"; return nullptr; diff --git a/src/server/create_cache_request.cc b/src/server/create_cache_request.cc index 0d49d0f..f0b02ce 100644 --- a/src/server/create_cache_request.cc +++ b/src/server/create_cache_request.cc @@ -25,7 +25,7 @@ const unsigned char* CreateCacheRequest::GetData() { return nullptr; } -int CreateCacheRequest::GetSize() { +size_t CreateCacheRequest::GetSize() { return 0; } diff --git a/src/server/create_cache_request.hh b/src/server/create_cache_request.hh index 18a03fe..97e80e6 100644 --- a/src/server/create_cache_request.hh +++ b/src/server/create_cache_request.hh @@ -39,7 +39,7 @@ class EXPORT_API CreateCacheRequest : public PkgRequest { CreateCacheRequest(uid_t uid, IEvent* listener) : uid_(uid), listener_(listener) {} const unsigned char* GetData() override; - int GetSize() override; + size_t GetSize() override; pid_t GetSenderPID() override; pid_t GetSenderTID() override; uid_t GetSenderUID() override; diff --git a/src/server/pkg_request.cc b/src/server/pkg_request.cc index 5de4a28..cb10e29 100644 --- a/src/server/pkg_request.cc +++ b/src/server/pkg_request.cc @@ -43,7 +43,7 @@ const unsigned char* PkgRequest::GetData() { return data_; } -int PkgRequest::GetSize() { +size_t PkgRequest::GetSize() { return data_size_; } diff --git a/src/server/pkg_request.hh b/src/server/pkg_request.hh index dcd2cfa..29f81fc 100644 --- a/src/server/pkg_request.hh +++ b/src/server/pkg_request.hh @@ -42,7 +42,7 @@ class EXPORT_API PkgRequest { bool ReceiveData(); virtual const unsigned char* GetData(); - virtual int GetSize(); + virtual size_t GetSize(); virtual pid_t GetSenderPID(); virtual pid_t GetSenderTID(); virtual uid_t GetSenderUID(); @@ -56,7 +56,7 @@ class EXPORT_API PkgRequest { std::unique_ptr socket_; unsigned char* data_ = nullptr; pkgmgr_common::ReqType request_type_; - int data_size_; + size_t data_size_; bool privilege_checked_; pid_t sender_tid_; }; diff --git a/src/server/request_handler/abstract_request_handler.hh b/src/server/request_handler/abstract_request_handler.hh index 1a54cd6..72cb5b5 100644 --- a/src/server/request_handler/abstract_request_handler.hh +++ b/src/server/request_handler/abstract_request_handler.hh @@ -23,7 +23,7 @@ namespace request_handler { class EXPORT_API AbstractRequestHandler { public: virtual ~AbstractRequestHandler() = default; - virtual bool HandleRequest(unsigned char* data, int size, + virtual bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) = 0; virtual tizen_base::Parcel ExtractResult(); diff --git a/src/server/request_handler/command_request_handler.cc b/src/server/request_handler/command_request_handler.cc index 47426fa..d98e4a4 100644 --- a/src/server/request_handler/command_request_handler.cc +++ b/src/server/request_handler/command_request_handler.cc @@ -20,7 +20,7 @@ namespace pcp = pkgmgr_common::parcel; namespace pkgmgr_server { namespace request_handler { -bool CommandRequestHandler::HandleRequest(unsigned char* data, int size, +bool CommandRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/command_request_handler.hh b/src/server/request_handler/command_request_handler.hh index a999aff..c04fd78 100644 --- a/src/server/request_handler/command_request_handler.hh +++ b/src/server/request_handler/command_request_handler.hh @@ -20,7 +20,7 @@ namespace request_handler { class EXPORT_API CommandRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; }; diff --git a/src/server/request_handler/create_cache_request_handler.cc b/src/server/request_handler/create_cache_request_handler.cc index 93bdf1a..d65fa95 100644 --- a/src/server/request_handler/create_cache_request_handler.cc +++ b/src/server/request_handler/create_cache_request_handler.cc @@ -64,7 +64,7 @@ int CreateCacheRequestHandler::Scheduler::Set(int priority) { CreateCacheRequestHandler::CreateCacheRequestHandler(): scheduler_(gettid()) { } -bool CreateCacheRequestHandler::HandleRequest(unsigned char* data, int size, +bool CreateCacheRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { psd::CacheDBHandler db(GetUID(), GetPID()); db.SetLocale(locale); diff --git a/src/server/request_handler/create_cache_request_handler.hh b/src/server/request_handler/create_cache_request_handler.hh index ad0ce17..836fdf2 100644 --- a/src/server/request_handler/create_cache_request_handler.hh +++ b/src/server/request_handler/create_cache_request_handler.hh @@ -20,7 +20,7 @@ namespace request_handler { class EXPORT_API CreateCacheRequestHandler : public AbstractRequestHandler { public: CreateCacheRequestHandler(); - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; tizen_base::Parcel ExtractResult() override; diff --git a/src/server/request_handler/create_db_request_handler.cc b/src/server/request_handler/create_db_request_handler.cc index 2c7da13..c6754e5 100644 --- a/src/server/request_handler/create_db_request_handler.cc +++ b/src/server/request_handler/create_db_request_handler.cc @@ -22,7 +22,7 @@ namespace psd = pkgmgr_server::database; namespace pkgmgr_server { namespace request_handler { -bool CreateDBRequestHandler::HandleRequest(unsigned char* data, int size, +bool CreateDBRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/create_db_request_handler.hh b/src/server/request_handler/create_db_request_handler.hh index 3057f32..d79edb1 100644 --- a/src/server/request_handler/create_db_request_handler.hh +++ b/src/server/request_handler/create_db_request_handler.hh @@ -19,7 +19,7 @@ namespace request_handler { class EXPORT_API CreateDBRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; }; diff --git a/src/server/request_handler/get_appinfo_request_handler.cc b/src/server/request_handler/get_appinfo_request_handler.cc index 827c09c..ce6a0b1 100644 --- a/src/server/request_handler/get_appinfo_request_handler.cc +++ b/src/server/request_handler/get_appinfo_request_handler.cc @@ -19,7 +19,7 @@ namespace pkgmgr_server { namespace request_handler { bool GetAppinfoRequestHandler::HandleRequest(unsigned char* data, - int size, const std::string& locale) { + size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/get_appinfo_request_handler.hh b/src/server/request_handler/get_appinfo_request_handler.hh index cd58141..57d4355 100644 --- a/src/server/request_handler/get_appinfo_request_handler.hh +++ b/src/server/request_handler/get_appinfo_request_handler.hh @@ -19,7 +19,7 @@ namespace request_handler { class EXPORT_API GetAppinfoRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string &locale) override; }; diff --git a/src/server/request_handler/get_cert_request_handler.cc b/src/server/request_handler/get_cert_request_handler.cc index 3574db9..32aed1f 100644 --- a/src/server/request_handler/get_cert_request_handler.cc +++ b/src/server/request_handler/get_cert_request_handler.cc @@ -18,7 +18,7 @@ namespace psd = pkgmgr_server::database; namespace pkgmgr_server { namespace request_handler { -bool GetCertRequestHandler::HandleRequest(unsigned char* data, int size, +bool GetCertRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/get_cert_request_handler.hh b/src/server/request_handler/get_cert_request_handler.hh index 011dc42..e8909c2 100644 --- a/src/server/request_handler/get_cert_request_handler.hh +++ b/src/server/request_handler/get_cert_request_handler.hh @@ -19,7 +19,7 @@ namespace request_handler { class EXPORT_API GetCertRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; }; diff --git a/src/server/request_handler/get_depinfo_request_handler.cc b/src/server/request_handler/get_depinfo_request_handler.cc index e2c6328..6aa2007 100644 --- a/src/server/request_handler/get_depinfo_request_handler.cc +++ b/src/server/request_handler/get_depinfo_request_handler.cc @@ -19,7 +19,7 @@ namespace psd = pkgmgr_server::database; namespace pkgmgr_server { namespace request_handler { -bool GetDepinfoRequestHandler::HandleRequest(unsigned char* data, int size, +bool GetDepinfoRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/get_depinfo_request_handler.hh b/src/server/request_handler/get_depinfo_request_handler.hh index bae7179..3bce7e8 100644 --- a/src/server/request_handler/get_depinfo_request_handler.hh +++ b/src/server/request_handler/get_depinfo_request_handler.hh @@ -19,7 +19,7 @@ namespace request_handler { class EXPORT_API GetDepinfoRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; }; diff --git a/src/server/request_handler/get_pkginfo_request_handler.cc b/src/server/request_handler/get_pkginfo_request_handler.cc index 11884fe..5a92de4 100644 --- a/src/server/request_handler/get_pkginfo_request_handler.cc +++ b/src/server/request_handler/get_pkginfo_request_handler.cc @@ -20,7 +20,7 @@ namespace pkgmgr_server { namespace request_handler { bool GetPkginfoRequestHandler::HandleRequest(unsigned char* data, - int size, const std::string& locale) { + size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/get_pkginfo_request_handler.hh b/src/server/request_handler/get_pkginfo_request_handler.hh index f163a89..a041b3d 100644 --- a/src/server/request_handler/get_pkginfo_request_handler.hh +++ b/src/server/request_handler/get_pkginfo_request_handler.hh @@ -19,7 +19,7 @@ namespace request_handler { class EXPORT_API GetPkginfoRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; }; diff --git a/src/server/request_handler/query_request_handler.cc b/src/server/request_handler/query_request_handler.cc index 2ccdffa..6eb5a28 100644 --- a/src/server/request_handler/query_request_handler.cc +++ b/src/server/request_handler/query_request_handler.cc @@ -19,7 +19,7 @@ namespace psd = pkgmgr_server::database; namespace pkgmgr_server { namespace request_handler { -bool QueryRequestHandler::HandleRequest(unsigned char* data, int size, +bool QueryRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/query_request_handler.hh b/src/server/request_handler/query_request_handler.hh index e96e235..3bb1639 100644 --- a/src/server/request_handler/query_request_handler.hh +++ b/src/server/request_handler/query_request_handler.hh @@ -20,7 +20,7 @@ namespace request_handler { class EXPORT_API QueryRequestHandler : public AbstractRequestHandler { public: - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; }; diff --git a/src/server/request_handler/set_cert_request_handler.cc b/src/server/request_handler/set_cert_request_handler.cc index 2852cca..47199f1 100644 --- a/src/server/request_handler/set_cert_request_handler.cc +++ b/src/server/request_handler/set_cert_request_handler.cc @@ -19,7 +19,7 @@ namespace psd = pkgmgr_server::database; namespace pkgmgr_server { namespace request_handler { -bool SetCertRequestHandler::HandleRequest(unsigned char* data, int size, +bool SetCertRequestHandler::HandleRequest(unsigned char* data, size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/set_cert_request_handler.hh b/src/server/request_handler/set_cert_request_handler.hh index 6e6a4ba..10df48d 100644 --- a/src/server/request_handler/set_cert_request_handler.hh +++ b/src/server/request_handler/set_cert_request_handler.hh @@ -21,7 +21,7 @@ class EXPORT_API SetCertRequestHandler : public AbstractRequestHandler { public: SetCertRequestHandler(bool is_offline = false) : AbstractRequestHandler(), is_offline_(is_offline) {} - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; private: diff --git a/src/server/request_handler/set_pkginfo_request_handler.cc b/src/server/request_handler/set_pkginfo_request_handler.cc index 24093ba..0387f78 100644 --- a/src/server/request_handler/set_pkginfo_request_handler.cc +++ b/src/server/request_handler/set_pkginfo_request_handler.cc @@ -22,7 +22,7 @@ namespace pkgmgr_server { namespace request_handler { bool SetPkginfoRequestHandler::HandleRequest(unsigned char* data, - int size, const std::string& locale) { + size_t size, const std::string& locale) { auto abstract_parcel = pcp::ParcelableFactory::GetInst().CreateParcel(data, size); diff --git a/src/server/request_handler/set_pkginfo_request_handler.hh b/src/server/request_handler/set_pkginfo_request_handler.hh index 0c4821c..c340246 100644 --- a/src/server/request_handler/set_pkginfo_request_handler.hh +++ b/src/server/request_handler/set_pkginfo_request_handler.hh @@ -21,7 +21,7 @@ class EXPORT_API SetPkginfoRequestHandler : public AbstractRequestHandler { public: SetPkginfoRequestHandler(bool is_offline = false) : AbstractRequestHandler(), is_offline_(is_offline) {} - bool HandleRequest(unsigned char* data, int size, + bool HandleRequest(unsigned char* data, size_t size, const std::string& locale) override; private: -- 2.7.4