The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2025-02-18 13:26:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct some memory corruption

Browse Source
This commit is contained in:
simon.kagstrom 2009-12-04 20:00:41 +00:00
parent 80a058c872
commit 71a7060bab
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu.cpp
View File

@ -25,14 +25,17 @@ void Menu::printText(SDL_Surface *where, const char *msg, SDL_Color clr,
unsigned int i; unsigned int i;
int tw; int tw;
buf = strdup(msg); buf = xstrdup(msg);
tw = this->font->getWidth(buf); tw = this->font->getWidth(buf);
/* Crop text */ /* Crop text */
if (x + tw > w) if (x + tw > w)
{ {
int pixels_per_char = tw / strlen(msg); int pixels_per_char = tw / strlen(buf);
int last_char = w / pixels_per_char; int last_char = (w / pixels_per_char) - 1;
if (last_char > strlen(buf))
last_char = strlen(buf) - 3;
/* FIXME! Handle some corner cases here (short strings etc) */ /* FIXME! Handle some corner cases here (short strings etc) */
if (last_char > 3) if (last_char > 3)
@ -117,8 +120,11 @@ void Menu::draw(SDL_Surface *where, int x, int y, int w, int h)
else if ( this->cur_sel < start_entry_visible ) else if ( this->cur_sel < start_entry_visible )
start_entry_visible = this->cur_sel; start_entry_visible = this->cur_sel;
if (start_entry_visible + entries_visible > this->n_entries)
entries_visible = this->n_entries - start_entry_visible;
for (int i = start_entry_visible; for (int i = start_entry_visible;
i <= start_entry_visible + entries_visible; i++) i < start_entry_visible + entries_visible; i++)
{ {
const char *msg = this->pp_msgs[i]; const char *msg = this->pp_msgs[i];
int cur_y; int cur_y;
@ -398,6 +404,7 @@ void Menu::setText(const char **messages, int *submenu_defaults)
} }
} }
this->pp_msgs = (const char **)xmalloc(this->n_entries * sizeof(const char *)); this->pp_msgs = (const char **)xmalloc(this->n_entries * sizeof(const char *));
if (this->n_submenus)
this->p_submenus = (submenu_t *)xmalloc(this->n_submenus * sizeof(submenu_t)); this->p_submenus = (submenu_t *)xmalloc(this->n_submenus * sizeof(submenu_t));
for (int i = 0; i < this->n_entries; i++) for (int i = 0; i < this->n_entries; i++)
this->pp_msgs[i] = xstrdup(messages[i]); this->pp_msgs[i] = xstrdup(messages[i]);

1
menu_messages.cpp
View File

@ -51,4 +51,5 @@ const char **main_menu_help[] = {
NULL, NULL,
}, },
NULL, NULL,
NULL,
}; };