Skip to content

ptp2/lib: add a check when deleting files #1059

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
Avenger-285714 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ptp2/lib: add a check when deleting files #1059

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
8 changes: 7 additions & 1 deletion camlibs/ptp2/library.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9027,6 +9027,7 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
const char *filename, void *data, GPContext *context)
{
Camera *camera = data;
uint32_t ret;
uint32_t storage;
PTPParams *params = &camera->pl->params;

Expand Down Expand Up @@ -9061,7 +9062,12 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
handle = find_child(params, filename, storage, handle, NULL);

/* in some cases we return errors ... just ignore them for now */
LOG_ON_PTP_E (ptp_deleteobject(params, handle, 0));
ret = ptp_deleteobject(params, handle, 0);
LOG_ON_PTP_E (ret);
if (ret != PTP_RC_OK) {
printf("Could not delete object.\n");
return GP_ERROR;
}

/* On some Canon firmwares, a DeleteObject causes a ObjectRemoved event
* to be sent. At least on Digital IXUS II and PowerShot A85. But
Expand Down