openharmony/print_print_fwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/print_print_fwk synced 2024-11-27 02:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复非法占用内存问题

Browse Source 
Signed-off-by: zheng_zhi_hao <zhengzhihao3@huawei.com>
This commit is contained in:
zheng_zhi_hao 2024-11-07 22:03:31 +08:00
parent 5130e4f646
commit 4048890bcf
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
services/print_service/src/print_service_ability.cpp
View File

@ -1683,6 +1683,12 @@ int32_t PrintServiceAbility::CheckAndSendQueuePrintJob(const std::string &jobId,
CheckJobQueueBlocked(*jobIt->second);
auto printerId = jobIt->second->GetPrinterId();
auto printerInfo = printSystemData_.QueryPrinterInfoByPrinterId(printerId);
if (printerInfo == nullptr) {
PRINT_HILOGE("Invalid printerId");
return E_PRINT_INVALID_PRINTER;
}
if (state == PRINT_JOB_BLOCKED) {
ReportHisysEvent(jobIt->second, printerId, subState);
}
@ -1693,13 +1699,10 @@ int32_t PrintServiceAbility::CheckAndSendQueuePrintJob(const std::string &jobId,
queuedJobList_.erase(jobId);
}
if (printerJobMap_[printerId].empty()) {
auto printerInfo = printSystemData_.QueryDiscoveredPrinterInfoById(printerId);
if (printerInfo != nullptr) {
printerInfo->SetPrinterStatus(PRINTER_STATUS_IDLE);
printSystemData_.UpdatePrinterStatus(printerId, PRINTER_STATUS_IDLE);
SendPrinterEventChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
SendPrinterChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
}
printerInfo->SetPrinterStatus(PRINTER_STATUS_IDLE);
printSystemData_.UpdatePrinterStatus(printerId, PRINTER_STATUS_IDLE);
SendPrinterEventChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
SendPrinterChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
}
if (IsQueuedJobListEmpty(jobId)) {
ReportCompletedPrint(printerId);
@ -3037,7 +3040,6 @@ int32_t PrintServiceAbility::AddSinglePrinterInfo(const PrinterInfo &info, const
SendPrinterDiscoverEvent(PRINTER_ADDED, *infoPtr);
SendPrinterEvent(*infoPtr);
SendQueuePrintJob(infoPtr->GetPrinterId());
if (printSystemData_.IsPrinterAdded(infoPtr->GetPrinterId()) &&
!printSystemData_.CheckPrinterBusy(infoPtr->GetPrinterId())) {
@ -3128,7 +3130,6 @@ bool PrintServiceAbility::AddVendorPrinterToDiscovery(const std::string &globalV
}
SendPrinterDiscoverEvent(PRINTER_ADDED, *printerInfo);
SendPrinterEvent(*printerInfo);
SendQueuePrintJob(globalPrinterId);
if (printSystemData_.IsPrinterAdded(printerInfo->GetPrinterId()) &&
!printSystemData_.CheckPrinterBusy(printerInfo->GetPrinterId())) {
if (CheckPrinterUriDifferent(printerInfo)) {

1
test/unittest/fwk_print_service_ability_test/print_service_ability_test.cpp
View File

@ -1512,6 +1512,7 @@ HWTEST_F(PrintServiceAbilityTest, PrintServiceAbilityTest_0084, TestSize.Level1)
service->printerJobMap_[printerId].insert(std::make_pair(jobId, true));
auto printerInfo = std::make_shared<PrinterInfo>();
service->printSystemData_.discoveredPrinterInfoList_[printerId] = printerInfo;
service->printSystemData_.addedPrinterInfoList_[printerId] = printerInfo;
EXPECT_EQ(service->CheckAndSendQueuePrintJob(jobId, state, subState), E_PRINT_NONE);
}