ports/77564: [Maintainer Update] sysutils/lineakd: Fix segfaults on AMD64 (Superseeds ports/77479)

[Kay Lehmann]

>Number:         77564
>Category:       ports
>Synopsis:       [Maintainer Update] sysutils/lineakd: Fix segfaults on AMD64 (Superseeds ports/77479)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 15 17:40:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Kay Lehmann
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:


System: FreeBSD 5.3-STABLE #3: Sat Feb  5 18:15:46 CET 2005
    root at bippes.finkenkrug.ev:/usr/obj/usr/src/sys/bippes



>Description:


This is the patch which has been commited to cvs of lineakd to fix 
problems described in  pr=ports/77479. The fix offered there seem 
to miss a line that has been changed in cvs. So I think cvs-version (which 
has been tested from Linux-folks) should be complete.


>How-To-Repeat:





>Fix:


--- patch-lineak__defloader.cpp begins here ---
--- lineak/defloader.cpp.orig	Tue Feb 15 18:28:46 2005
+++ lineak/defloader.cpp	Tue Feb 15 18:28:49 2005
@@ -129,7 +129,7 @@
 	   // Handle empty lines.
 	   loc = tmp.find('=');
            // empty line
-   	   if (loc == string::npos)
+   	   if (loc == (unsigned int)string::npos)
    	     continue;
 
 	   // key == the name of the key.
@@ -157,13 +157,13 @@
 		 //cout << akey;
 	         /** Now determine if this is a toggleable key. We will have to parse
 	             the name format name1|name2 if indeed it is a toggleable key. */
-		 if ((unsigned int)key.find('|') != string::npos) {
+		 if ((unsigned int)key.find('|') != (unsigned int)string::npos) {
 		    key+='|';
 		    akey->setToggle(true);
 		    int index;
 		    string tmp;
 	            //vector<string>names;
-	            while (((unsigned int)(index = key.find('|'))) != string::npos) {
+	            while (((unsigned int)(index = key.find('|'))) != (unsigned int)string::npos) {
 		       tmp = key.substr(0,index);
 		       //cout << "adding toggle name: " << tmp << " to " << akey->getName() << endl;
                        akey->addToggleName(tmp);
--- patch-lineak__defloader.cpp ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: