[Emacs-diffs] /srv/bzr/emacs/trunk r108017: src/gnutls.c: Fix previous change.

[Juanma Barranquero]

------------------------------------------------------------
revno: 108017
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-24 10:35:02 +0200
message:
  src/gnutls.c: Fix previous change.
  (init_gnutls_functions): Protect against (unlikely) manipulation
  of :loaded-from data.
modified:
  src/ChangeLog
  src/gnutls.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-23 23:15:08 +0000
+++ b/src/ChangeLog     2012-04-24 08:35:02 +0000
@@ -1,3 +1,8 @@
+2012-04-24  Juanma Barranquero  <address@hidden>
+
+       * gnutls.c (init_gnutls_functions): Protect against (unlikely)
+       manipulation of :loaded-from data.
+
 2012-04-23  Juanma Barranquero  <address@hidden>
 
        * gnutls.c (init_gnutls_functions): The value of :loaded-from is

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2012-04-23 23:15:08 +0000
+++ b/src/gnutls.c      2012-04-24 08:35:02 +0000
@@ -200,8 +200,12 @@
 
   max_log_level = global_gnutls_log_level;
 
-  GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
-              SDATA (XCAR (Fget (Qgnutls_dll, QCloaded_from))));
+  {
+    Lisp_Object name = CAR_SAFE (Fget (Qgnutls_dll, QCloaded_from));
+    GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
+                 STRINGP (name) ? (const char *) SDATA (name) : "unknown");
+  }
+
   return 1;
 }