Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/graphviz/patches/graphviz-2.26.0-testsuite-sigsegv-fix.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 457 aa27b836c528
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
457
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     1
 
--- graphviz-2.26.0/lib/gvc/gvconfig.c.old	2009-07-08 17:14:20.000000000 +0200
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     2
 
+++ graphviz-2.26.0/lib/gvc/gvconfig.c	2010-10-20 11:51:21.238392202 +0200
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     3
 
@@ -471,6 +471,7 @@
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     4
 
         libdir = gvconfig_libdir(gvc);
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     5
 
         rc = stat(libdir, &libdir_st);
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     6
 
         if (rc == -1) {
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     7
 
+            gvtextlayout_select(gvc);   /* choose best available textlayout plugin immediately */
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     8
 
     	    /* if we fail to stat it then it probably doesn't exist so just fail silently */
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     9
 
 	    return;
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    10
 
         }
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    11
 
@@ -485,6 +486,7 @@
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    12
 
         if (rescan) {
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    13
 
     	    config_rescan(gvc, gvc->config_path);
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    14
 
     	    gvc->config_found = TRUE;
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    15
 
+            gvtextlayout_select(gvc);   /* choose best available textlayout plugin immediately */
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    16
 
     	    return;
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    17
 
         }
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    18
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    19
 
@@ -492,6 +494,7 @@
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    20
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    21
 
         rc = stat(gvc->config_path, &config_st);
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    22
 
         if (rc == -1) {
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    23
 
+            gvtextlayout_select(gvc);   /* choose best available textlayout plugin immediately */
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    24
 
     	    /* silently return without setting gvc->config_found = TRUE */
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    25
 
     	    return;
aa27b836c528 PSARC/2011/269 Graphviz
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    26
 
         }
upstream/oracle/userland-gate