From lkoeller@cc.fh-lippe.de  Thu May 18 00:09:50 2000
Return-Path: <lkoeller@cc.fh-lippe.de>
Received: from henoch.cc.fh-lippe.de (henoch.cc.fh-lippe.de [193.16.112.72])
	by hub.freebsd.org (Postfix) with ESMTP id CA7F037BD4C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 May 2000 00:09:45 -0700 (PDT)
	(envelope-from lkoeller@cc.fh-lippe.de)
Received: from spock.cc.fh-lippe.de([193.16.118.120]) (3098 bytes) 
	by henoch.cc.fh-lippe.de
	via sendmail with P:esmtp/R:inet_hosts/T:smtp
	(sender: <lkoeller@cc.fh-lippe.de>) 
	id <m12sKR5-0000G7C@henoch.cc.fh-lippe.de>
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 May 2000 09:09:35 +0200 (MET DST)
	(Smail-3.2.0.111 2000-Feb-17 #1 built 2000-Mar-17)
Received: from door.lippe.de(arabesca.cc.fh-lippe.de[193.16.112.163]) (2709 bytes) by spock.cc.fh-lippe.de
	via sendmail with P:smtp/R:smart_host/T:smtp
	(sender: <lkoeller@cc.fh-lippe.de>) 
	id <m12sKR0-0006zHC@spock.cc.fh-lippe.de>
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 May 2000 09:09:30 +0200 (MET DST)
	(Smail-3.2.0.111 2000-Feb-17 #1 built 2000-Mar-17)
Received: from odie.lippe.de (root@odie.lippe.de [192.168.4.2])
	by door.lippe.de (8.9.3/8.9.3) with ESMTP id IAA90466
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 May 2000 08:15:24 +0200 (CEST)
	(envelope-from lkoeller@lippe.de)
Received: (from lkoeller@localhost)
	by odie.lippe.de (8.9.3/8.9.3) id IAA85841;
	Thu, 18 May 2000 08:15:23 +0200 (CEST)
	(envelope-from lkoeller)
Message-Id: <200005180615.IAA85841@odie.lippe.de>
Date: Thu, 18 May 2000 08:15:23 +0200 (CEST)
From: lkoeller@cc.fh-lippe.de
Reply-To: lkoeller@cc.fh-lippe.de
To: FreeBSD-gnats-submit@freebsd.org
Subject: tclock additional patch avoids segfaults.
X-Send-Pr-Version: 3.2

>Number:         18643
>Category:       ports
>Synopsis:       tclock additional patch avoids segfaults.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 18 00:10:01 PDT 2000
>Closed-Date:    Fri May 19 00:51:02 PDT 2000
>Last-Modified:  Fri May 19 00:51:52 PDT 2000
>Originator:     Lars Koeller
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
Fachhochschule Lippe, Lemgo, Germany
>Environment:

	FreeBSD-3.4 with ports up to date.

>Description:

	In some special cases tclock segfaults after startup. This is due
	to special cases with the merging of X11 resources.

>How-To-Repeat:

	-

>Fix:

	The appended patch avoids this problem! Simple place it as patch-ab
	int the ports patch-dir.


Regards

Lars

--
E-Mail:                                     |  Lars Koeller
  Lars.Koeller@Uni-Bielefeld.DE              |  UNIX Sysadmin
  lkoeller@cc.fh-lippe.de                     |  Computing Center
PGP-key:                                       |  University of Bielefeld
  http://www.pgp.net/pgpnet/www-key.html        |  Germany
----------- FreeBSD, what else? ---- http://www.freebsd.org -------------


------------------------- patch-ab for tclock ---------------------------

diff -u ../../tclock.old/work/tclock.c ./tclock.c
--- ../../tclock.old/work/tclock.c	Mon May 15 13:07:35 2000
+++ ./tclock.c	Mon May 15 13:18:02 2000
@@ -312,6 +312,7 @@
   extern
   char		*getenv();
   char		*displayName, fn[1000];
+  char		*sdb;
   int		parseReturn, rc;

   XrmParseCommand(&db, option, numOptions, "tclock", &ac, av);
@@ -344,7 +345,8 @@
     exit(1);

   db = XrmGetStringDatabase(tclockDefaults);
-  XrmMergeDatabases(XrmGetStringDatabase(XResourceManagerString(display)), &db);
+  if(sdb = XResourceManagerString(display))
+    XrmMergeDatabases(XrmGetStringDatabase(sdb), &db);

   sprintf(fn, "%s/.Xdefaults", getenv("HOME"));
   if(access(fn, R_OK) == 0)

--------------------------------------------------------------------------

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Fri May 19 00:51:02 PDT 2000 
State-Changed-Why:  
Patch merged into existing patch-aa for tclock.c, thanks! 
>Unformatted:
