Fixed intermittent crashes in clientprefs (bug 4660, r=psychonic).
authorAsher Baker <asherkin@gmail.com>
Tue May 29 17:41:48 2012 +0100 (2012-05-29)
changeset 3536fddd9e8bdef5
parent 3535 f55559e36bfe
child 3537 58bcb9a0d8e7
Fixed intermittent crashes in clientprefs (bug 4660, r=psychonic).
extensions/clientprefs/cookie.cpp
extensions/clientprefs/menus.cpp
     1.1 --- a/extensions/clientprefs/cookie.cpp	Mon May 28 11:42:58 2012 -0400
     1.2 +++ b/extensions/clientprefs/cookie.cpp	Tue May 29 17:41:48 2012 +0100
     1.3 @@ -396,7 +396,7 @@
     1.4  				{
     1.5  					ItemDrawInfo draw;
     1.6  					const char *info = clientMenu->GetItemInfo(i, &draw);
     1.7 -					AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
     1.8 +					AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
     1.9  
    1.10  					if (data->handler->forward != NULL)
    1.11  					{
     2.1 --- a/extensions/clientprefs/menus.cpp	Mon May 28 11:42:58 2012 -0400
     2.2 +++ b/extensions/clientprefs/menus.cpp	Tue May 29 17:41:48 2012 +0100
     2.3 @@ -40,7 +40,7 @@
     2.4  
     2.5  	const char *info = menu->GetItemInfo(item, &draw);
     2.6  
     2.7 -	AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
     2.8 +	AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
     2.9  
    2.10  	if (data->handler->forward != NULL)
    2.11  	{
    2.12 @@ -94,7 +94,7 @@
    2.13  
    2.14  	const char *info = menu->GetItemInfo(item, &draw);
    2.15  
    2.16 -	AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
    2.17 +	AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
    2.18  
    2.19  	if (data->handler->forward != NULL)
    2.20  	{
    2.21 @@ -122,7 +122,7 @@
    2.22  
    2.23  	const char *info = menu->GetItemInfo(item, &draw);
    2.24  
    2.25 -	AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
    2.26 +	AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
    2.27  
    2.28  	switch (data->type)
    2.29  	{