Skip to content

Makes sure to free a pointer we own #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alindeman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Makes sure to free a pointer we own #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions ext/geoip/geoip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static VALUE rb_geoip_database_new(VALUE mGeoIP_Database_Class, int argc, VALUE
}

/* Generic, single-value look up method */
static VALUE generic_single_value_lookup_response(char *key, char *value)
static VALUE generic_single_value_lookup_response(const char *key, char *value)
{
VALUE result = rb_hash_new();
if(value) {
Expand Down Expand Up @@ -267,7 +267,14 @@ VALUE rb_geoip_org_look_up(VALUE self, VALUE addr) {
GeoIP *gi;
Check_Type(addr, T_STRING);
Data_Get_Struct(self, GeoIP, gi);
return generic_single_value_lookup_response("name", GeoIP_name_by_addr(gi, StringValuePtr(addr)));

char *name = GeoIP_name_by_addr(gi, StringValuePtr(addr));
VALUE response = generic_single_value_lookup_response("name", name);

if (name) {
free(name);
}
return response;
}

/* GeoIP::ISP *******************************************************/
Expand All @@ -293,7 +300,14 @@ VALUE rb_geoip_isp_look_up(VALUE self, VALUE addr) {
GeoIP *gi;
Check_Type(addr, T_STRING);
Data_Get_Struct(self, GeoIP, gi);
return generic_single_value_lookup_response("isp", GeoIP_name_by_addr(gi, StringValuePtr(addr)));

char *name = GeoIP_name_by_addr(gi, StringValuePtr(addr));
VALUE response = generic_single_value_lookup_response("isp", name);

if (name) {
free(name);
}
return response;
}

/* GeoIP::NetSpeed *******************************************************/
Expand All @@ -319,7 +333,14 @@ VALUE rb_geoip_netspeed_look_up(VALUE self, VALUE addr) {
GeoIP *gi;
Check_Type(addr, T_STRING);
Data_Get_Struct(self, GeoIP, gi);
return generic_single_value_lookup_response("netspeed", GeoIP_name_by_addr(gi, StringValuePtr(addr)));

char *name = GeoIP_name_by_addr(gi, StringValuePtr(addr));
VALUE response = generic_single_value_lookup_response("netspeed", name);

if (name) {
free(name);
}
return response;
}

/* GeoIP::Domain *******************************************************/
Expand All @@ -345,7 +366,14 @@ VALUE rb_geoip_domain_look_up(VALUE self, VALUE addr) {
GeoIP *gi;
Check_Type(addr, T_STRING);
Data_Get_Struct(self, GeoIP, gi);
return generic_single_value_lookup_response("domain", GeoIP_name_by_addr(gi, StringValuePtr(addr)));

char *name = GeoIP_name_by_addr(gi, StringValuePtr(addr));
VALUE response = generic_single_value_lookup_response("domain", name);

if (name) {
free(name);
}
return response;
}

/* GeoIP *********************************************************************/
Expand Down