From 8a6cce1964559e092f3441b5a1177c53babf058b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 23 Mar 2015 10:13:15 +0100
Subject: [PATCH] (net_http) Prevent NULL pointer dereferences

---
 libretro-common/net/net_http.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index 6348511a48..ebf9826fe3 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -244,6 +244,9 @@ bool net_http_connection_done(struct http_connection_t *conn)
 
 void net_http_connection_free(struct http_connection_t *conn)
 {
+   if (!conn)
+      return;
+
    if (conn->urlcopy)
       free(conn->urlcopy);
 }
@@ -311,6 +314,8 @@ error:
 
 int net_http_fd(struct http_t *state)
 {
+   if (!state)
+      return 0;
    return state->fd;
 }
 
@@ -318,7 +323,7 @@ bool net_http_update(struct http_t *state, size_t* progress, size_t* total)
 {
    ssize_t newlen = 0;
 
-   if (state->error)
+   if (!state || state->error)
       goto fail;
 
    if (state->part < P_BODY)
@@ -511,11 +516,16 @@ fail:
 
 int net_http_status(struct http_t *state)
 {
-   return state->status;
+   if (state)
+      return state->status;
+   return -1;
 }
 
 uint8_t* net_http_data(struct http_t *state, size_t* len, bool accept_error)
 {
+   if (!state)
+      return NULL;
+
    if (!accept_error && 
          (state->error || state->status<200 || state->status>299))
    {
@@ -532,6 +542,9 @@ uint8_t* net_http_data(struct http_t *state, size_t* len, bool accept_error)
 
 void net_http_delete(struct http_t *state)
 {
+   if (!state)
+      return;
+
    if (state->fd != -1)
       socket_close(state->fd);
    if (state->data)