Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/24590a1145f3d9e6a2842d51b426157da653be5d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/24590a1145f3d9e6a2842d51b426157da653be5d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/24590a1145f3d9e6a2842d51b426157da653be5d
The branch, master has been updated
via 24590a1145f3d9e6a2842d51b426157da653be5d (commit)
from 93494790f31b4a0bb36827bc60e00e97559482f8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=24590a1145f3d9e6a2842d51b426157da653be5d
commit 24590a1145f3d9e6a2842d51b426157da653be5d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Check callback memory is allocated before trying to use it.
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index da674f8..307fff3 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -345,12 +345,13 @@ nserror ami_schedule(int t, void (*callback)(void *p),
void *p)
nscb = AllocSysObjectTags(ASOT_IOREQUEST,
ASOIOR_Duplicate,
tioreq,
TAG_DONE);
+ if(nscb == NULL) return NSERROR_NOMEM;
#else
if(schedule_msgport == NULL) return NSERROR_NOMEM;
nscb = AllocVec(sizeof(struct nscallback), MEMF_PUBLIC | MEMF_CLEAR);
+ if(nscb == NULL) return NSERROR_NOMEM;
*nscb = *tioreq;
#endif
- if(!nscb) return NSERROR_NOMEM;
if (ami_schedule_add_timer_event(nscb, t) != NSERROR_OK)
return NSERROR_NOMEM;
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/schedule.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index da674f8..307fff3 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -345,12 +345,13 @@ nserror ami_schedule(int t, void (*callback)(void *p),
void *p)
nscb = AllocSysObjectTags(ASOT_IOREQUEST,
ASOIOR_Duplicate,
tioreq,
TAG_DONE);
+ if(nscb == NULL) return NSERROR_NOMEM;
#else
if(schedule_msgport == NULL) return NSERROR_NOMEM;
nscb = AllocVec(sizeof(struct nscallback), MEMF_PUBLIC | MEMF_CLEAR);
+ if(nscb == NULL) return NSERROR_NOMEM;
*nscb = *tioreq;
#endif
- if(!nscb) return NSERROR_NOMEM;
if (ami_schedule_add_timer_event(nscb, t) != NSERROR_OK)
return NSERROR_NOMEM;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
