From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Hansen Newsgroups: gmane.emacs.devel Subject: dbusbind.c patch, fixes possible segfault Date: Sun, 13 Apr 2008 16:28:46 +0200 Organization: disorganized Message-ID: <874pa5ltgh.fsf@localhorst.mine.nu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1208097517 23606 80.91.229.12 (13 Apr 2008 14:38:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Apr 2008 14:38:37 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 13 16:39:12 2008 connect(): Connection refused Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jl3MH-0007As-D6 for ged-emacs-devel@m.gmane.org; Sun, 13 Apr 2008 16:39:05 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jl3Ld-0006IE-Bs for ged-emacs-devel@m.gmane.org; Sun, 13 Apr 2008 10:38:25 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jl3LY-0006Hm-Uq for emacs-devel@gnu.org; Sun, 13 Apr 2008 10:38:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jl3LX-0006HO-OV for emacs-devel@gnu.org; Sun, 13 Apr 2008 10:38:20 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jl3LX-0006HL-MU for emacs-devel@gnu.org; Sun, 13 Apr 2008 10:38:19 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jl3LX-00080m-9x for emacs-devel@gnu.org; Sun, 13 Apr 2008 10:38:19 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Jl3LT-000539-Mz for emacs-devel@gnu.org; Sun, 13 Apr 2008 14:38:16 +0000 Original-Received: from e178023022.adsl.alicedsl.de ([85.178.23.22]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Apr 2008 14:38:15 +0000 Original-Received: from david.hansen by e178023022.adsl.alicedsl.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Apr 2008 14:38:15 +0000 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 57 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: e178023022.adsl.alicedsl.de Mail-Copies-To: nobody User-Agent: Gnus/5.110009 (No Gnus v0.9) Emacs/23.0.60 (gnu/linux) Cancel-Lock: sha1:MZsRwkoWnLofNDLIluRxsB/AeDs= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:95105 Archived-At: --=-=-= This one is similar to the previous dbusbind.c patch. No need to copy the string and if dbus_bus_get_unique_name () returns NULL strcpy will segfault. David 2008-04-13 David Hansen * dbusbind.c (dbus-get-unique-name): Remove extra copying of name string. --=-=-= Content-Type: text/x-patch Content-Disposition: inline *** dbusbind.c.~1.24.~ 2008-04-05 23:46:55.000000000 +0200 --- dbusbind.c 2008-04-13 15:19:27.000000000 +0200 *************** *** 701,707 **** Lisp_Object bus; { DBusConnection *connection; ! char name[DBUS_MAXIMUM_NAME_LENGTH]; /* Check parameters. */ CHECK_SYMBOL (bus); --- 701,707 ---- Lisp_Object bus; { DBusConnection *connection; ! const char *name; /* Check parameters. */ CHECK_SYMBOL (bus); *************** *** 710,716 **** connection = xd_initialize (bus); /* Request the name. */ ! strcpy (name, dbus_bus_get_unique_name (connection)); if (name == NULL) xsignal1 (Qdbus_error, build_string ("No unique name available")); --- 710,716 ---- connection = xd_initialize (bus); /* Request the name. */ ! name = dbus_bus_get_unique_name (connection); if (name == NULL) xsignal1 (Qdbus_error, build_string ("No unique name available")); --=-=-=--