Fix pointer issues in local PTP event queue in Nikon capture (#849)
https://github.com/gphoto/libgphoto2/issues/846 Co-authored-by: Omri Sarig <omri.sarig@prevas.dk>
This commit is contained in:
@@ -4170,7 +4170,7 @@ capturetriggered:
|
||||
if (ret != PTP_RC_OK) {
|
||||
/* store back all the queued events back to the hw event queue before returning. */
|
||||
/* we do not do this in all error edge cases currently, only the ones that can trigger often */
|
||||
ptp_add_events (params, &storedevents, nrstoredevents);
|
||||
ptp_add_events (params, storedevents, nrstoredevents);
|
||||
C_PTP_REP (ret);
|
||||
}
|
||||
|
||||
@@ -4251,7 +4251,7 @@ capturetriggered:
|
||||
} while ((done != 3) && waiting_for_timeout (&back_off_wait, capture_start, 70*1000)); /* 70 seconds */
|
||||
|
||||
/* add all the queued events back to the event queue */
|
||||
ptp_add_events (params, &storedevents, nrstoredevents);
|
||||
ptp_add_events (params, storedevents, nrstoredevents);
|
||||
|
||||
/* Maximum image time is 30 seconds, but NR processing might take 25 seconds ... so wait longer.
|
||||
* see https://github.com/gphoto/libgphoto2/issues/94 */
|
||||
|
||||
@@ -3236,7 +3236,7 @@ ptp_add_event_queue (PTPContainer **events, unsigned int *nrevents, PTPContainer
|
||||
if (!levents)
|
||||
return PTP_RC_GeneralError;
|
||||
*events = levents;
|
||||
memcpy (&events[*nrevents],evt,1*sizeof(PTPContainer));
|
||||
memcpy (&levents[*nrevents],evt,1*sizeof(PTPContainer));
|
||||
(*nrevents)++;
|
||||
return PTP_RC_OK;
|
||||
}
|
||||
@@ -3254,12 +3254,12 @@ ptp_add_event (PTPParams *params, PTPContainer *evt)
|
||||
}
|
||||
|
||||
uint16_t
|
||||
ptp_add_events (PTPParams *params, PTPContainer **evt, unsigned int nrevents)
|
||||
ptp_add_events (PTPParams *params, PTPContainer *evt, unsigned int nrevents)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i=0;i<nrevents;i++) {
|
||||
CHECK_PTP_RC (ptp_add_event_queue (¶ms->events, ¶ms->nrofevents, evt[i]));
|
||||
CHECK_PTP_RC (ptp_add_event_queue (¶ms->events, ¶ms->nrofevents, &evt[i]));
|
||||
}
|
||||
return PTP_RC_OK;
|
||||
}
|
||||
|
||||
@@ -4033,7 +4033,7 @@ uint16_t ptp_check_event (PTPParams *params);
|
||||
uint16_t ptp_check_event_queue (PTPParams *params);
|
||||
uint16_t ptp_wait_event (PTPParams *params);
|
||||
uint16_t ptp_add_event (PTPParams *params, PTPContainer *evt);
|
||||
uint16_t ptp_add_events (PTPParams *params, PTPContainer **evt, unsigned int nrevents);
|
||||
uint16_t ptp_add_events (PTPParams *params, PTPContainer *evt, unsigned int nrevents);
|
||||
uint16_t ptp_add_event_queue (PTPContainer **events, unsigned int *nrevents, PTPContainer *evt);
|
||||
int ptp_have_event(PTPParams *params, uint16_t code);
|
||||
int ptp_get_one_event (PTPParams *params, PTPContainer *evt);
|
||||
|
||||
Reference in New Issue
Block a user