PERFORCE change 132269 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=132269

Change 132269 by jb at jb_freebsd1 on 2008/01/01 22:53:22

	Watch out for a NULL pointer that can ruin one's day. Or part thereof.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#8 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#8 (text) ====

@@ -10660,7 +10660,8 @@
 	nsize = enab->dten_maxdesc * sizeof (dtrace_enabling_t *);
 	ndesc = kmem_zalloc(nsize, KM_SLEEP);
 	bcopy(enab->dten_desc, ndesc, osize);
-	kmem_free(enab->dten_desc, osize);
+	if (enab->dten_desc != NULL)
+		kmem_free(enab->dten_desc, osize);
 
 	enab->dten_desc = ndesc;
 	enab->dten_desc[enab->dten_ndesc++] = ecb;