<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/eb0a577a2e93b4d3520a9e753c256739f450d7c6">https://github.com/macports/macports-base/commit/eb0a577a2e93b4d3520a9e753c256739f450d7c6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new eb0a577 misc src/: switch from "string is integer" to "string is entier".
</span>eb0a577 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eb0a577a2e93b4d3520a9e753c256739f450d7c6
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Sat Feb 4 19:56:53 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> misc src/: switch from "string is integer" to "string is entier".
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The "string is integer" check bails out of the passed data does not fit
</span><span style='display:block; white-space:pre;color:#404040;'> in an 32bit (signed) integer data type. Contrary to that, "string is
</span><span style='display:block; white-space:pre;color:#404040;'> entier" has bignum support and no constraints on the actual value.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> All this said, sqlite3 might fail if the value doesn't fit into a signed
</span><span style='display:block; white-space:pre;color:#404040;'> 8-byte-integer, but we don't actually have a recovery plan for that
</span><span style='display:block; white-space:pre;color:#404040;'> yet... and beside `port lint`, we don't check for such an overflow in
</span><span style='display:block; white-space:pre;color:#404040;'> the first place.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53489
</span>---
src/macports1.0/macports_util.tcl | 4 ++--
src/macports1.0/reclaim.tcl | 2 +-
src/port/port.tcl | 4 ++--
src/port1.0/portbuild.tcl | 4 ++--
src/port1.0/portlint.tcl | 8 ++++----
5 files changed, 11 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_util.tcl b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 441e505..41f2419 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +108,7 @@ proc ldindex {varName args} {
</span> set idx [lindex $args 0]
set size [llength $var]
set badrange? 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string is integer -strict $idx]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string is entier -strict $idx]} {
</span> if {$idx < 0 || $idx >= $size} {
set badrange? 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +116,7 @@ proc ldindex {varName args} {
</span> if {$size == 0} {
set badrange? 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[string match "end-*" $idx] && [string is integer -strict [string range $idx 4 end]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[string match "end-*" $idx] && [string is entier -strict [string range $idx 4 end]]} {
</span> set i [expr {$size - 1 - [string range $idx 4 end]}]
if {$i < 0 || $i >= $size} {
set badrange? 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/reclaim.tcl b/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a188d05..4a0e173 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,7 +354,7 @@ namespace eval reclaim {
</span>
set time [read_last_run_file]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![string is integer -strict $time]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string is entier -strict $time]} {
</span> return
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3189509..a80b236 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5480,7 +5480,7 @@ namespace eval portclient::questions {
</span> throw
}
signal -restart error {TERM INT}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {($input <= [llength $ports] && [string is integer -strict $input])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {($input <= [llength $ports] && [string is entier -strict $input])} {
</span> return [expr {$input - 1}]
} else {
puts "Please enter an index from the above list."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5545,7 +5545,7 @@ namespace eval portclient::questions {
</span>
set err_flag 1
foreach num $input {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string is integer -strict $num] && $num <= [llength $ports] && $num > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string is entier -strict $num] && $num <= [llength $ports] && $num > 0} {
</span> lappend selected_opt [expr {$num -1}]
} elseif {[regexp {(\d+)-(\d+)} $input _ start end]
&& $start <= [llength $ports]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portbuild.tcl b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 61aa2a0..cd92f8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@ proc portbuild::build_getjobs {args} {
</span> }
} catch {*} {}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![string is integer -strict $jobs] || $jobs <= 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string is entier -strict $jobs] || $jobs <= 1} {
</span> set jobs 1
}
return $jobs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,7 +177,7 @@ proc portbuild::build_getjobsarg {args} {
</span> return ""
}
set jobs [option build.jobs]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![string is integer -strict $jobs] || $jobs <= 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string is entier -strict $jobs] || $jobs <= 1} {
</span> return ""
}
return " -j$jobs"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 335ab49..ba671f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,11 +426,11 @@ proc portlint::lint_main {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![string is integer -strict $epoch]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Port epoch is not numeric: $epoch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string is entier -strict $epoch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Port epoch is not numeric: $epoch"
</span> incr errors
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![string is integer -strict $revision]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string is entier -strict $revision]} {
</span> ui_error "Port revision is not numeric: $revision"
incr errors
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -635,7 +635,7 @@ proc portlint::lint_main {args} {
</span> # if the last character of license name is a number or plus sign
# then a hyphen is missing
set license_end [string index $subtest end]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"+" eq $license_end || [string is integer -strict $license_end]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"+" eq $license_end || [string is entier -strict $license_end]} {
</span> ui_error "invalid license '${test}': missing hyphen before version"
incr errors
}
</pre><pre style='margin:0'>
</pre>