Skip to content

fix: reject overflowing camera notification fps#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonycoder-hub wants to merge 1 commit into
base:master
Choose a base branch
from
Open

fix: reject overflowing camera notification fps #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions services/camera_service/src/hstream_repeat.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
#include "hstream_repeat.h"
#include "iproxy_broker.h"

#include <charconv>
#include <cstdint>
#include <mutex>

Expand DownExpand Up@@ -49,6 +50,15 @@ using CM_ColorSpaceType_V2_1 = OHOS::HDI::Display::Graphic::Common::V2_1::CM_Col
constexpr int32_t INT32_ZERO = 0;
constexpr int32_t INT32_ONE = 1;
constexpr int32_t INT32_TWO = 2;

bool ParseInt32(const std::string &value, int32_t &result)
{
const char *begin = value.data();
const char *end = begin + value.size();
auto parsed = std::from_chars(begin, end, result);
return parsed.ec == std::errc{} && parsed.ptr == end;
}

HStreamRepeat::HStreamRepeat(
sptr<OHOS::IBufferProducer> producer, int32_t format, int32_t width, int32_t height, RepeatStreamType type)
: HStreamCommon(StreamType::REPEAT, producer, format, width, height), repeatStreamType_(type)
Expand DownExpand Up@@ -1486,8 +1496,12 @@ bool HStreamRepeat::IsNeedBeautyNotification()
CHECK_CONTINUE(configInfo.size() < CONFIG_SIZE);
CHECK_CONTINUE(!isIntegerRegex(configInfo[INT32_ONE]) || !isIntegerRegex(configInfo[INT32_TWO]));
std::string configBundleName = configInfo[INT32_ZERO];
int32_t configMinFPS = std::atoi(configInfo[INT32_ONE].c_str());
int32_t configMAXFPS = std::atoi(configInfo[INT32_TWO].c_str());
int32_t configMinFPS = 0;
int32_t configMAXFPS = 0;
if (!ParseInt32(configInfo[INT32_ONE], configMinFPS) ||
!ParseInt32(configInfo[INT32_TWO], configMAXFPS)) {
continue;
}
if (configBundleName == bundleName && configMinFPS == streamFrameRateRange_[INT32_ZERO] &&
configMAXFPS == streamFrameRateRange_[INT32_ONE]) {
ret = true;
Expand DownExpand Up@@ -1517,7 +1531,10 @@ bool HStreamRepeat::IsLive()
CHECK_CONTINUE(configBundleName != bundleName);
for (int j = INT32_ONE; j < configInfo.size(); ++j) {
CHECK_CONTINUE(!isIntegerRegex(configInfo[j]));
int32_t configFPS = std::atoi(configInfo[j].c_str());
int32_t configFPS = 0;
if (!ParseInt32(configInfo[j], configFPS)) {
continue;
}
if (configFPS == streamFrameRateRange_[INT32_ZERO] && configFPS == streamFrameRateRange_[INT32_ONE]) {
ret = true;
break;
Expand Down