svn rev #24058: branches/krb5-1-8/src/util/support/

tlyu@MIT.EDU tlyu at MIT.EDU
Wed May 19 14:52:36 EDT 2010


http://src.mit.edu/fisheye/changelog/krb5/?cs=24058
Commit By: tlyu
Log Message:
ticket: 6697
version_fixed: 1.8.2
status: resolved

pull up r23929 from trunk

 ------------------------------------------------------------------------
 r23929 | tlyu | 2010-04-22 21:30:48 -0400 (Thu, 22 Apr 2010) | 7 lines

 ticket: 6697
 target_version: 1.8.2
 tags: pullup

 Adapted patch from Arlene Berry to handle dlerror() returning a null
 pointer.


Changed Files:
U   branches/krb5-1-8/src/util/support/plugins.c
Modified: branches/krb5-1-8/src/util/support/plugins.c
===================================================================
--- branches/krb5-1-8/src/util/support/plugins.c	2010-05-19 18:52:32 UTC (rev 24057)
+++ branches/krb5-1-8/src/util/support/plugins.c	2010-05-19 18:52:36 UTC (rev 24058)
@@ -268,6 +268,8 @@
             handle = dlopen(filepath, PLUGIN_DLOPEN_FLAGS);
             if (handle == NULL) {
                 const char *e = dlerror();
+                if (e == NULL)
+                    e = "unknown failure";
                 Tprintf ("dlopen(%s): %s\n", filepath, e);
                 err = ENOENT; /* XXX */
                 krb5int_set_error (ep, err, "%s", e);
@@ -335,6 +337,8 @@
         sym = dlsym (h->dlhandle, csymname);
         if (sym == NULL) {
             const char *e = dlerror (); /* XXX copy and save away */
+            if (e == NULL)
+                e = "unknown failure";
             Tprintf ("dlsym(%s): %s\n", csymname, e);
             err = ENOENT; /* XXX */
             krb5int_set_error(ep, err, "%s", e);




More information about the cvs-krb5 mailing list