e424d781ddad6fa42f9e49fc0f15f9343017759e max Fri Oct 3 12:02:14 2014 -0700 fixing null pointer error that occurs in gbib using angie's suggested code changes in refs #14067, note 58, refs #11957 diff --git src/lib/common.c src/lib/common.c index 117fff1..95b281d 100644 --- src/lib/common.c +++ src/lib/common.c @@ -365,31 +365,31 @@ void slSortMerge(void *pA, void *b, CmpFunction *compare) // Merges and sorts a pair of singly linked lists using slSort. { struct slList **pList = (struct slList **)pA; slCat(*pList, b); slSort(pList,compare); } void slSortMergeUniq(void *pA, void *b, CmpFunction *compare, void (*free)()) // Merges and sorts a pair of singly linked lists leaving only unique // items via slUniqufy. duplicate itens are defined by the compare routine // returning 0. If free is provided, items dropped from list can disposed of. { struct slList **pList = (struct slList **)pA; -slCat(*pList, b); +*pList = slCat(*pList, b); slUniqify(pList,compare,free); } boolean slRemoveEl(void *vpList, void *vToRemove) /* Remove element from singly linked list. Usage: * slRemove(&list, el); * Returns TRUE if element in list. */ { struct slList **pList = vpList; struct slList *toRemove = vToRemove; struct slList *el, *next, *newList = NULL; boolean didRemove = FALSE; for (el = *pList; el != NULL; el = next) {