URI header now returns pointers with ownership.
I've put `.release()` at most of the callsites, but this gives me something to search for when taking the next steps.
This commit is contained in:
16
src/menu.cc
16
src/menu.cc
@ -376,7 +376,7 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url,
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
popup_url = a_Url_dup(*url).release();
|
||||
|
||||
has_bugs == TRUE ? pm[1].activate() : pm[1].deactivate();
|
||||
|
||||
@ -420,7 +420,7 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url,
|
||||
}
|
||||
|
||||
stylesheets[j].label(FL_NORMAL_LABEL, label);
|
||||
stylesheets[j].callback(Menu_stylesheet_cb, a_Url_dup(url));
|
||||
stylesheets[j].callback(Menu_stylesheet_cb, a_Url_dup(*url).release());
|
||||
}
|
||||
|
||||
pm[2].user_data(stylesheets);
|
||||
@ -555,7 +555,7 @@ void a_Menu_link_popup(BrowserWindow *bw, const DilloUrl *url, const DilloUrl *p
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
popup_url = a_Url_dup(*url).release();
|
||||
|
||||
Fl_Menu_Item *link_menu = get_link_menu();
|
||||
link_data.menu = link_menu;
|
||||
@ -592,11 +592,11 @@ void a_Menu_image_popup(BrowserWindow *bw, const DilloUrl *url,
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
popup_url = a_Url_dup(*url).release();
|
||||
delete popup_page_url;
|
||||
popup_page_url = a_Url_dup(page_url);
|
||||
popup_page_url = a_Url_dup(*page_url).release();
|
||||
delete popup_link_url;
|
||||
popup_link_url = a_Url_dup(link_url);
|
||||
popup_link_url = a_Url_dup(*link_url).release();
|
||||
|
||||
|
||||
pm[0].user_data(popup_url);
|
||||
@ -643,7 +643,7 @@ void a_Menu_form_popup(BrowserWindow *bw, const DilloUrl *page_url,
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(page_url);
|
||||
popup_url = a_Url_dup(*page_url).release();
|
||||
popup_form = formptr;
|
||||
|
||||
hiddens_visible = hidvis;
|
||||
@ -704,7 +704,7 @@ void a_Menu_bugmeter_popup(BrowserWindow *bw, const DilloUrl *url)
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
popup_url = a_Url_dup(*url).release();
|
||||
|
||||
a_Timeout_add(0.0, Menu_simple_popup_cb, (void*)pm);
|
||||
}
|
||||
|
Reference in New Issue
Block a user