[GNUnet-SVN] [gnunet] branch master updated: -fix possible npe

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new ec9269fd9 -fix possible npe
     new e2343119b Merge branch 'master' of git+ssh://gnunet.org/gnunet
ec9269fd9 is described below

commit ec9269fd94cda7b2195dcbe754eda053288478b7
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Jan 5 20:11:18 2018 +0100

    -fix possible npe
---
 src/identity/plugin_rest_identity.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/identity/plugin_rest_identity.c 
b/src/identity/plugin_rest_identity.c
index 5f34d0f1b..33804143d 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -593,6 +593,7 @@ ego_edit_cont (struct GNUNET_REST_RequestHandle *con,
   struct GNUNET_JSONAPI_Resource *json_res;
   struct RequestHandle *handle = cls;
   struct EgoEntry *ego_entry;
+  struct EgoEntry *ego_entry_tmp;
   struct MHD_Response *resp;
   json_t *subsys_json;
   json_t *name_json;
@@ -684,12 +685,12 @@ ego_edit_cont (struct GNUNET_REST_RequestHandle *con,
   if ((NULL != name_json) && json_is_string (name_json))
   {
     newname = json_string_value (name_json);
-    for (ego_entry = handle->ego_head;
-         NULL != ego_entry;
-         ego_entry = ego_entry->next)
+    for (ego_entry_tmp = handle->ego_head;
+         NULL != ego_entry_tmp;
+         ego_entry_tmp = ego_entry_tmp->next)
     {
-      if (0 == strcasecmp (newname, ego_entry->identifier) &&
-          0 != strcasecmp (keystring, ego_entry->keystring))
+      if (0 == strcasecmp (newname, ego_entry_tmp->identifier) &&
+          0 != strcasecmp (keystring, ego_entry_tmp->keystring))
       {
         //Ego with same name not allowed
         GNUNET_JSONAPI_document_delete (json_obj);

-- 
To stop receiving notification emails like this one, please contact
address@hidden