mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 04:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2005-04-05 17:19:58 by rjw]

Browse Source 
Add sanity checks to Sprite file handling and simplify code.

svn path=/import/netsurf/; revision=1600
This commit is contained in:
Richard Wilson 2005-04-05 17:19:58 +00:00
parent 8e9561dc29
commit 9acf6d31cf
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/content.c
View File

@ -195,7 +195,7 @@ static const struct handler_entry handler_map[] = {
0, nsmng_destroy, 0, nsmng_redraw, 0, 0, false},
#endif
#ifdef WITH_SPRITE
{sprite_create, 0, sprite_convert,
{0, 0, sprite_convert,
0, sprite_destroy, 0, sprite_redraw, 0, 0, false},
#endif
#ifdef WITH_DRAW

33
riscos/sprite.c
View File

@ -30,28 +30,6 @@
#ifdef WITH_SPRITE
/**
* Create a new CONTENT_SPRITE.
*
* A new empty sprite area is allocated.
*/
bool sprite_create(struct content *c, const char *params[])
{
union content_msg_data msg_data;
c->data.sprite.data = malloc(4);
if (!c->data.sprite.data) {
msg_data.error = messages_get("NoMemory");
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
warn_user("NoMemory", 0);
return false;
}
c->data.sprite.length = 4;
return true;
}
/**
* Convert a CONTENT_SPRITE for display.
*
@ -68,6 +46,13 @@ bool sprite_convert(struct content *c, int width, int height)
source_data = ((char *)c->source_data) - 4;
osspriteop_area *area = (osspriteop_area*)source_data;
c->data.sprite.data = area;
/* check for bad data */
if ((int)c->source_size + 4 != area->used) {
msg_data.error = messages_get("BadSprite");
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
return false;
}
error = xosspriteop_read_sprite_info(osspriteop_PTR,
(osspriteop_area *)0x100,
@ -86,7 +71,7 @@ bool sprite_convert(struct content *c, int width, int height)
c->title = malloc(100);
if (c->title)
snprintf(c->title, 100, messages_get("SpriteTitle"), c->width,
c->height, c->data.sprite.length);
c->height, c->source_size);
c->status = CONTENT_STATUS_DONE;
return true;
}
@ -99,7 +84,7 @@ bool sprite_convert(struct content *c, int width, int height)
void sprite_destroy(struct content *c)
{
/* do not free c->data.sprite.data at it is simply a pointer to
* 4 bytes before the c->data.source_data. */
* 4 bytes beforec->source_data. */
free(c->title);
}

3
riscos/sprite.h
View File

@ -18,11 +18,8 @@ struct content;
struct content_sprite_data {
void *data;
unsigned long length;
};
bool sprite_create(struct content *c, const char *params[]);
bool sprite_process_data(struct content *c, char *data, unsigned int size);
bool sprite_convert(struct content *c, int width, int height);
void sprite_destroy(struct content *c);
bool sprite_redraw(struct content *c, int x, int y,