This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] Fix condition in DLL loading loop
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 11 Mar 2015 11:23:08 -0000
- Subject: [newlib-cygwin] Fix condition in DLL loading loop
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f085e9d3212360cfbce69a7a42c04ad7999b8cd6
commit f085e9d3212360cfbce69a7a42c04ad7999b8cd6
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Wed Mar 11 12:22:45 2015 +0100
Fix condition in DLL loading loop
Diff:
---
winsup/cygwin/ChangeLog | 5 +++++
winsup/cygwin/autoload.cc | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index cd2dbb9..56af2b8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-11 Corinna Vinschen <corinna@vinschen.de>
+
+ * autoload.cc (std_dll_init): Fix condition for breaking from DLL
+ loading loop.
+
2015-03-10 Yaakov Selkowitz <yselkowitz@cygwin.com>
* include/stdint.h: Fix __x86_64__ conditional.
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index a4812a6..fd25e17 100644
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -1,7 +1,7 @@
/* autoload.cc: all dynamic load stuff.
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- 2011, 2012, 2013, 2014 Red Hat, Inc.
+ 2011, 2012, 2013, 2014, 2015 Red Hat, Inc.
This file is part of Cygwin.
@@ -429,7 +429,7 @@ std_dll_init ()
for (i = 1; i <= RETRY_COUNT; i++)
{
/* If loading the library succeeds, just leave the loop. */
- if (!dll_load (dll->handle, dll_path))
+ if (dll_load (dll->handle, dll_path))
break;
/* Otherwise check error code returned by LoadLibrary. If the
error code is neither NOACCESS nor DLL_INIT_FAILED, break out