Fossil SCM

Cherrypick [8184f39d803f9ad6|8184f39d]: Fix crash in /reports page, when compiling with recent gcc. (this is NOT an -O2 optimization bug!)

jan.nijtmans 2015-06-02 09:17 UTC trunk
Commit 08709aa79cfd1552efd94824196da207d0909641
Parent 9c65b5432e4aeec…
4 files changed +1 -1 +1 -1 +1 -1 +1 -1
~ Dockerfile ~ Dockerfile ~ src/statrep.c ~ src/statrep.c
M Dockerfile
+1 -1
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
55
66
 ### Now install some additional parts we will need for the build
77
 RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
88
99
 ### If you want to build "release", change the next line accordingly.
10
-ENV FOSSIL_INSTALL_VERSION trunk
10
+ENV FOSSIL_INSTALL_VERSION branch-1.33
1111
1212
 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
1313
 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
1414
 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
1515
 RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
1616
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "release", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION trunk
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
16
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "release", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION branch-1.33
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
16
M Dockerfile
+1 -1
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
55
66
 ### Now install some additional parts we will need for the build
77
 RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
88
99
 ### If you want to build "release", change the next line accordingly.
10
-ENV FOSSIL_INSTALL_VERSION trunk
10
+ENV FOSSIL_INSTALL_VERSION branch-1.33
1111
1212
 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
1313
 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
1414
 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
1515
 RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
1616
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "release", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION trunk
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
16
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "release", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION branch-1.33
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
16
M src/statrep.c
+1 -1
--- src/statrep.c
+++ src/statrep.c
@@ -691,10 +691,11 @@
691691
 HQuery url; /* URL for various branch links */
692692
 const char *zView = P("view"); /* Which view/report to show. */
693693
 int eType = RPT_NONE; /* Numeric code for view/report to show */
694694
 int i; /* Loop counter */
695695
 const char *zUserName; /* Name of user */
696
+ const char *azView[16]; /* Drop-down menu of view types */
696697
 const struct {
697698
 const char *zName; /* Name of view= screen type */
698699
 const char *zVal; /* Value of view= query parameter */
699700
 int eType; /* Corresponding RPT_* define */
700701
 } aViewType[] = {
@@ -731,11 +732,10 @@
731732
 }
732733
 url_initialize(&url, "reports");
733734
 cgi_query_parameters_to_url(&url);
734735
 if( eType!=RPT_NONE ){
735736
 int nView = 0; /* Slots used in azView[] */
736
- const char *azView[16]; /* Drop-down menu of view types */
737737
 for(i=0; i<ArraySize(aViewType); i++){
738738
 azView[nView++] = aViewType[i].zVal;
739739
 azView[nView++] = aViewType[i].zName;
740740
 }
741741
 if( eType!=RPT_BYFILE ){
742742
--- src/statrep.c
+++ src/statrep.c
@@ -691,10 +691,11 @@
691 HQuery url; /* URL for various branch links */
692 const char *zView = P("view"); /* Which view/report to show. */
693 int eType = RPT_NONE; /* Numeric code for view/report to show */
694 int i; /* Loop counter */
695 const char *zUserName; /* Name of user */
 
696 const struct {
697 const char *zName; /* Name of view= screen type */
698 const char *zVal; /* Value of view= query parameter */
699 int eType; /* Corresponding RPT_* define */
700 } aViewType[] = {
@@ -731,11 +732,10 @@
731 }
732 url_initialize(&url, "reports");
733 cgi_query_parameters_to_url(&url);
734 if( eType!=RPT_NONE ){
735 int nView = 0; /* Slots used in azView[] */
736 const char *azView[16]; /* Drop-down menu of view types */
737 for(i=0; i<ArraySize(aViewType); i++){
738 azView[nView++] = aViewType[i].zVal;
739 azView[nView++] = aViewType[i].zName;
740 }
741 if( eType!=RPT_BYFILE ){
742
--- src/statrep.c
+++ src/statrep.c
@@ -691,10 +691,11 @@
691 HQuery url; /* URL for various branch links */
692 const char *zView = P("view"); /* Which view/report to show. */
693 int eType = RPT_NONE; /* Numeric code for view/report to show */
694 int i; /* Loop counter */
695 const char *zUserName; /* Name of user */
696 const char *azView[16]; /* Drop-down menu of view types */
697 const struct {
698 const char *zName; /* Name of view= screen type */
699 const char *zVal; /* Value of view= query parameter */
700 int eType; /* Corresponding RPT_* define */
701 } aViewType[] = {
@@ -731,11 +732,10 @@
732 }
733 url_initialize(&url, "reports");
734 cgi_query_parameters_to_url(&url);
735 if( eType!=RPT_NONE ){
736 int nView = 0; /* Slots used in azView[] */
 
737 for(i=0; i<ArraySize(aViewType); i++){
738 azView[nView++] = aViewType[i].zVal;
739 azView[nView++] = aViewType[i].zName;
740 }
741 if( eType!=RPT_BYFILE ){
742
M src/statrep.c
+1 -1
--- src/statrep.c
+++ src/statrep.c
@@ -691,10 +691,11 @@
691691
 HQuery url; /* URL for various branch links */
692692
 const char *zView = P("view"); /* Which view/report to show. */
693693
 int eType = RPT_NONE; /* Numeric code for view/report to show */
694694
 int i; /* Loop counter */
695695
 const char *zUserName; /* Name of user */
696
+ const char *azView[16]; /* Drop-down menu of view types */
696697
 const struct {
697698
 const char *zName; /* Name of view= screen type */
698699
 const char *zVal; /* Value of view= query parameter */
699700
 int eType; /* Corresponding RPT_* define */
700701
 } aViewType[] = {
@@ -731,11 +732,10 @@
731732
 }
732733
 url_initialize(&url, "reports");
733734
 cgi_query_parameters_to_url(&url);
734735
 if( eType!=RPT_NONE ){
735736
 int nView = 0; /* Slots used in azView[] */
736
- const char *azView[16]; /* Drop-down menu of view types */
737737
 for(i=0; i<ArraySize(aViewType); i++){
738738
 azView[nView++] = aViewType[i].zVal;
739739
 azView[nView++] = aViewType[i].zName;
740740
 }
741741
 if( eType!=RPT_BYFILE ){
742742
--- src/statrep.c
+++ src/statrep.c
@@ -691,10 +691,11 @@
691 HQuery url; /* URL for various branch links */
692 const char *zView = P("view"); /* Which view/report to show. */
693 int eType = RPT_NONE; /* Numeric code for view/report to show */
694 int i; /* Loop counter */
695 const char *zUserName; /* Name of user */
 
696 const struct {
697 const char *zName; /* Name of view= screen type */
698 const char *zVal; /* Value of view= query parameter */
699 int eType; /* Corresponding RPT_* define */
700 } aViewType[] = {
@@ -731,11 +732,10 @@
731 }
732 url_initialize(&url, "reports");
733 cgi_query_parameters_to_url(&url);
734 if( eType!=RPT_NONE ){
735 int nView = 0; /* Slots used in azView[] */
736 const char *azView[16]; /* Drop-down menu of view types */
737 for(i=0; i<ArraySize(aViewType); i++){
738 azView[nView++] = aViewType[i].zVal;
739 azView[nView++] = aViewType[i].zName;
740 }
741 if( eType!=RPT_BYFILE ){
742
--- src/statrep.c
+++ src/statrep.c
@@ -691,10 +691,11 @@
691 HQuery url; /* URL for various branch links */
692 const char *zView = P("view"); /* Which view/report to show. */
693 int eType = RPT_NONE; /* Numeric code for view/report to show */
694 int i; /* Loop counter */
695 const char *zUserName; /* Name of user */
696 const char *azView[16]; /* Drop-down menu of view types */
697 const struct {
698 const char *zName; /* Name of view= screen type */
699 const char *zVal; /* Value of view= query parameter */
700 int eType; /* Corresponding RPT_* define */
701 } aViewType[] = {
@@ -731,11 +732,10 @@
732 }
733 url_initialize(&url, "reports");
734 cgi_query_parameters_to_url(&url);
735 if( eType!=RPT_NONE ){
736 int nView = 0; /* Slots used in azView[] */
 
737 for(i=0; i<ArraySize(aViewType); i++){
738 azView[nView++] = aViewType[i].zVal;
739 azView[nView++] = aViewType[i].zName;
740 }
741 if( eType!=RPT_BYFILE ){
742

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button