* nis/nis_table.c (nis_list): If __follow_path fails in the new

code, make sure the nis_freeresult call doesn't crash and that the result is reported correctly.
git-mirror · Oct 6, 2006 · 4df92d5 · 4df92d5
1 parent 6836157
commit 4df92d5
Show file tree

Hide file tree

Showing 3 changed files with 4,889 additions and 4,358 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* nis/nis_table.c (nis_list): If __follow_path fails in the new
+	code, make sure the nis_freeresult call doesn't crash and that the
+	result is reported correctly.
+
 2006-09-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* nis/nis_table.c (nis_list): Handle FOLLOW_PATH | ALL_RESULTS

diff --git a/nis/nis_table.c b/nis/nis_table.c
@@ -438,7 +438,11 @@ nis_list (const_nis_name name, unsigned int flags,
 					     &bptr);
 		if (clnt_status != NIS_SUCCESS)
 		  {
-		    NIS_RES_STATUS (res) = clnt_status;
+		    /* Prepare for the nis_freeresult call.  */
+		    memset (res, '\0', sizeof (*res));
+
+		    if (clnt_status == NIS_NOMEMORY)
+		      NIS_RES_STATUS (allres) = clnt_status;
 		    ++done;
 		  }
 	      }