Corrected merge conflict.

README.rst

@@ -43,7 +43,8 @@ You can use LuaRocks to install Turbo.
 
 If installation fails make sure that you have these required pacakages:
 
-``apt-get install git build-essential libssl-dev luajit``
+``apt-get install luajit luarocks git build-essential libssl-dev``
+
 
 Linux distro's are the only OS supported at this point (although adding support for other Unix's is trivial).
 Make sure that the latest LuaJIT is installed. Version 2.0 is required, http://luajit.org/. Most package managers have LuaJIT 2.0 available by now.

deps/turbo_ffi_wrap.c

@@ -188,6 +188,8 @@ char *url_field(const char *url_str,
                 enum http_parser_url_fields prop)
 {
     char * urlstr = malloc(url->field_data[prop].len + 1);
+    if (!urlstr)
+        return NULL;
     memcpy(urlstr, url_str + url->field_data[prop].off, url->field_data[prop].len);
     urlstr[url->field_data[prop].len] = '\0';
     return urlstr;