Re: Let's tell we are using GTK+

[Terje Rosten]

* Lute Kamstra
|
| > +  {
| > +    char gtk_version[8];
| > +    sprintf (gtk_version, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
| > +        GTK_MICRO_VERSION);
| > +    Vgtk_version_string = build_string (gtk_version);
| > +  }
| 
| this seems vulnerable to a buffer overflow.

That's right. In a updated patch I increased to gtk_version[12], but
that's not large enough if a GTK+ release is named e.g 2.2.cvs20030819.


| It is acceptable to use snprintf instead, or isn't that portable
| enough?  (I'm not really intimate with C.)  What could be used
| instead, a larger string?

What about using glib? If GTK+ is available then is glib available
too. A updated patch using the glib function g_snprintf is included.


 - Terje


Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.5348
diff -c -r1.5348 ChangeLog
*** lisp/ChangeLog      18 Aug 2003 22:46:02 -0000      1.5348
--- lisp/ChangeLog      19 Aug 2003 10:42:16 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-08-18 Terje Rosten <address@hidden>
+ 
+       * version.el (emacs-version): Check for gtk. Include gtk version
+       info.
+ 
  2003-08-18  Luc Teirlinck  <address@hidden>
  
        * wid-edit.el (widget-echo-help): Make it handle expressions that
Index: lisp/version.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/version.el,v
retrieving revision 2.32
diff -c -r2.32 version.el
*** lisp/version.el     4 Feb 2003 12:12:31 -0000       2.32
--- lisp/version.el     19 Aug 2003 10:42:16 -0000
***************
*** 62,67 ****
--- 62,69 ----
                 (cond ((featurep 'motif)
                        (concat ", " (substring motif-version-string 4)))
                       ((featurep 'x-toolkit) ", X toolkit")
+                      ((featurep 'gtk)
+                       (concat ", GTK+ " gtk-version-string))
                       (t ""))
                 (if (and (boundp 'x-toolkit-scroll-bars)
                          (memq x-toolkit-scroll-bars '(xaw xaw3d)))
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.3335
diff -c -r1.3335 ChangeLog
*** src/ChangeLog       17 Aug 2003 00:25:37 -0000      1.3335
--- src/ChangeLog       19 Aug 2003 10:42:18 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-08-18  Terje Rosten <address@hidden>
+ 
+       * xfns.c (Vgtk_version_string): New variable.
+       (syms_of_xfns): DEFVAR_LISP it. Provide gtk.
+ 
  2003-08-16  Richard M. Stallman  <address@hidden>
  
        * editfns.c (Fencode_time): Doc fix.
Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.590
diff -c -r1.590 xfns.c
*** src/xfns.c  31 Jul 2003 16:10:53 -0000      1.590
--- src/xfns.c  19 Aug 2003 10:42:19 -0000
***************
*** 125,130 ****
--- 125,138 ----
  
  #endif /* USE_X_TOOLKIT */
  
+ #ifdef USE_GTK
+ 
+ /* GTK+ version info */
+ 
+ static Lisp_Object Vgtk_version_string;
+ 
+ #endif /* USE_GTK */
+ 
  #ifdef HAVE_X11R4
  #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
  #else
***************
*** 10885,10890 ****
--- 10893,10911 ----
    Vmotif_version_string = build_string (XmVERSION_STRING);
  #endif /* USE_MOTIF */
  #endif /* USE_X_TOOLKIT */
+ 
+ #ifdef USE_GTK
+   Fprovide (intern ("gtk"), Qnil);
+ 
+   DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
+                doc: /* Version info for GTK+.  */);
+   {
+     char gtk_version[12];
+     g_snprintf (gtk_version, sizeof (gtk_version), "%d.%d.%d",
+                 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+     Vgtk_version_string = build_string (gtk_version);
+   }
+ #endif /* USE_GTK */
  
    /* X window properties.  */
    defsubr (&Sx_change_window_property);