Changeset 108064 in vbox

Timestamp:

Feb 5, 2025 11:02:20 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167344

Message:

VBoxDTrace: Address some Solaris-specific Parfait concerns in the CTF
code and libdtrace by pulling in the fixes from upstream (S11.4).
bugref:3409

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Files:

• common/ctf/ctf_types.c (modified) (3 diffs)
• lib/libdtrace/common/dt_aggregate.c (modified) (1 diff)
• lib/libdtrace/common/dt_cc.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_types.c

@@ -242 +242 @@
 
                         ctf_file_t *rfp = fp;
+                        const char *name;
                         const ctf_type_t *tp =
                             ctf_lookup_by_id(&rfp, cdp->cd_type);
-                        const char *name = ctf_strptr(rfp, tp->ctt_name);
+
+                        if (tp == NULL) {
+                                return (-1); /* errno is set for us */
+                        }
+
+                        name = ctf_strptr(rfp, tp->ctt_name);
 
                         if (k != CTF_K_POINTER && k != CTF_K_ARRAY)
@@ -312 +318 @@
 {
         ssize_t rv = ctf_type_lname(fp, type, buf, len);
-        return (rv >= 0 && VBDTCAST(size_t)rv < len ? buf : NULL);
+        return ((rv >= 0 && (size_t)rv < len) ? buf : NULL);
 }
 
@@ -408 +414 @@
                         for (; n != 0; n--, mp++) {
                                 ssize_t am = ctf_type_align(fp, mp->ctm_type);
-                                align = MAX(VBDTCAST(ssize_t)align, am);
+                                if (am == -1) {
+                                        return (-1); /* errno is set for us */
+                                }
+                                align = MAX(align, (size_t)am);
                         }
                 } else {

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_aggregate.c

@@ -1024 +1024 @@
         dt_aggregate_t *agp = &dtp->dt_aggregate;
         dtrace_optval_t size, cpu;
-        dtrace_bufdesc_t *buf = &agp->dtat_buf;
+        dtrace_bufdesc_t *buf;
         int rval, i;
 

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c

@@ -2020 +2020 @@
 
                 dtp->dt_filetag = fname;
-                if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0)
+                if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) {
+                        (void) fclose(fp);
                         goto err;
+                }
 
                 rv = dt_compile(dtp, DT_CTX_DPROG,
@@ -2029 +2031 @@
                 if (rv != NULL && dtp->dt_errno &&
                     (dtp->dt_errno != EDT_COMPILER ||
-                    dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND)))
+                    dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) {
+                        (void) fclose(fp);
                         goto err;
+                }
 
                 if (dtp->dt_errno)