Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "9241f4fd200a5ec30e241ee1de3811b7d67e24f2"
Commit cf5e25a9 authored by Juha Reunanen's avatar Juha Reunanen Committed by Davis E. King
Browse files

Problem: integer overflow when calculating sizes (may happen e.g. with very large images) (#1148) 

* Problem: integer overflow when calculating sizes (may happen e.g. with very large images)
Solution: change some types from (unsigned) long to size_t

# Conflicts:
#	dlib/dnn/tensor.h

* Fix the fact that std::numeric_limits<unsigned long>::max() isn't always the same number

* Revert serialization changes

* Review fix: use long long instead of size_t

* From long to long long all the way

* Change more types to (hopefully) make the compiler happy

* Change many more types to size_t

* Change even more types to size_t

* Minor type changes
parent 1cf6dbf4
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
dlib/lzp_buffer/lzp_buffer_kernel_abstract.h
View file @ cf5e25a9
......@@ -100,7 +100,7 @@ namespace dlib
until clear() is called and succeeds
!*/
unsigned long size (
size_t size (
) const;
/*!
ensures
......
dlib/manifold_regularization/linear_manifold_regularizer.h
View file @ cf5e25a9
......@@ -40,7 +40,7 @@ namespace dlib
typedef std::vector<neighbor>::const_iterator const_iterator;
unsigned long size (
size_t size (
) const
/*!
ensures
......
dlib/map/map_kernel_1.h
View file @ cf5e25a9
......@@ -91,7 +91,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -311,7 +311,7 @@ namespace dlib
typename bst_base,
typename mem_manager
>
unsigned long map_kernel_1<domain,range,bst_base,mem_manager>::
size_t map_kernel_1<domain,range,bst_base,mem_manager>::
size (
) const
{
......
dlib/opencv/cv_image.h
View file @ cf5e25a9
......@@ -50,7 +50,7 @@ namespace dlib
cv_image() : _data(0), _widthStep(0), _nr(0), _nc(0) {}
unsigned long size () const { return static_cast<unsigned long>(_nr*_nc); }
size_t size () const { return static_cast<size_t>(_nr*_nc); }
inline pixel_type* operator[](const long row )
{
......
dlib/opencv/cv_image_abstract.h
View file @ cf5e25a9
......@@ -127,7 +127,7 @@ namespace dlib
- returns the number of columns in this image
!*/
unsigned long size (
size_t size (
) const;
/*!
ensures
......
dlib/pipe/pipe_kernel_1.h
View file @ cf5e25a9
......@@ -66,7 +66,7 @@ namespace dlib
typedef T type;
explicit pipe (
unsigned long maximum_size
size_t maximum_size
);
virtual ~pipe (
......@@ -109,10 +109,10 @@ namespace dlib
bool is_enabled (
) const;
unsigned long max_size (
size_t max_size (
) const;
unsigned long size (
size_t size (
) const;
bool enqueue (
......@@ -144,14 +144,14 @@ namespace dlib
private:
unsigned long pipe_size;
const unsigned long pipe_max_size;
size_t pipe_size;
const size_t pipe_max_size;
bool enabled;
T* const data;
unsigned long first;
unsigned long last;
size_t first;
size_t last;
mutex m;
signaler dequeue_sig;
......@@ -181,7 +181,7 @@ namespace dlib
>
pipe<T>::
pipe (
unsigned long maximum_size
size_t maximum_size
) :
pipe_size(0),
pipe_max_size(maximum_size),
......@@ -313,7 +313,7 @@ namespace dlib
template <
typename T
>
unsigned long pipe<T>::
size_t pipe<T>::
max_size (
) const
{
......@@ -326,7 +326,7 @@ namespace dlib
template <
typename T
>
unsigned long pipe<T>::
size_t pipe<T>::
size (
) const
{
......
dlib/pipe/pipe_kernel_abstract.h
View file @ cf5e25a9
......@@ -38,7 +38,7 @@ namespace dlib
typedef T type;
explicit pipe (
unsigned long maximum_size
size_t maximum_size
);
/*!
ensures
......@@ -175,7 +175,7 @@ namespace dlib
- #is_dequeue_enabled() == true
!*/
unsigned long max_size (
size_t max_size (
) const;
/*!
ensures
......@@ -183,7 +183,7 @@ namespace dlib
pipe can contain.
!*/
unsigned long size (
size_t size (
) const;
/*!
ensures
......
dlib/queue/queue_kernel_1.h
View file @ cf5e25a9
......@@ -103,7 +103,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -402,7 +402,7 @@ namespace dlib
typename T,
typename mem_manager
>
unsigned long queue_kernel_1<T,mem_manager>::
size_t queue_kernel_1<T,mem_manager>::
size (
) const
{
......
dlib/queue/queue_kernel_2.h
View file @ cf5e25a9
......@@ -112,7 +112,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -155,13 +155,13 @@ namespace dlib
node* in;
node* out;
unsigned long queue_size;
unsigned long in_pos;
unsigned long out_pos;
size_t queue_size;
size_t in_pos;
size_t out_pos;
mutable node* current_element;
mutable unsigned long current_element_pos;
mutable size_t current_element_pos;
mutable bool at_start_;
// restricted functions
......@@ -419,7 +419,7 @@ namespace dlib
unsigned long block_size,
typename mem_manager
>
unsigned long queue_kernel_2<T,block_size,mem_manager>::
size_t queue_kernel_2<T,block_size,mem_manager>::
size (
) const
{
......
dlib/sequence/sequence_kernel_1.h
View file @ cf5e25a9
......@@ -144,7 +144,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
bool at_start (
......@@ -446,7 +446,7 @@ namespace dlib
typename T,
typename mem_manager
>
unsigned long sequence_kernel_1<T,mem_manager>::
size_t sequence_kernel_1<T,mem_manager>::
size (
) const
{
......
dlib/sequence/sequence_kernel_2.h
View file @ cf5e25a9
......@@ -103,7 +103,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
bool at_start (
......@@ -430,7 +430,7 @@ namespace dlib
typename T,
typename mem_manager
>
unsigned long sequence_kernel_2<T,mem_manager>::
size_t sequence_kernel_2<T,mem_manager>::
size (
) const
{
......
dlib/set/set_kernel_1.h
View file @ cf5e25a9
......@@ -80,7 +80,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -254,7 +254,7 @@ namespace dlib
typename bst_base,
typename mem_manager
>
unsigned long set_kernel_1<T,bst_base,mem_manager>::
size_t set_kernel_1<T,bst_base,mem_manager>::
size (
) const
{
......
dlib/sliding_buffer/sliding_buffer_kernel_1.h
View file @ cf5e25a9
......@@ -82,7 +82,7 @@ namespace dlib
catch (...) { buffer = 0; buffer_size = 0; throw; }
}
unsigned long size (
size_t size (
) const { return buffer_size; }
void rotate_left (
......
dlib/stack/stack_kernel_1.h
View file @ cf5e25a9
......@@ -97,7 +97,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -365,7 +365,7 @@ namespace dlib
typename T,
typename mem_manager
>
unsigned long stack_kernel_1<T,mem_manager>::
size_t stack_kernel_1<T,mem_manager>::
size (
) const
{
......
dlib/static_map/static_map_kernel_1.h
View file @ cf5e25a9
......@@ -157,7 +157,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -433,7 +433,7 @@ namespace dlib
typename range,
typename compare
>
unsigned long static_map_kernel_1<domain,range,compare>::
size_t static_map_kernel_1<domain,range,compare>::
size (
) const
{
......
dlib/static_set/static_set_kernel_1.h
View file @ cf5e25a9
......@@ -52,11 +52,11 @@ namespace dlib
try
{
item.clear();
unsigned long size;
size_t size;
deserialize(size,in);
item.set_size = size;
item.d = new T[size];
for (unsigned long i = 0; i < size; ++i)
for (size_t i = 0; i < size; ++i)
{
deserialize(item.d[i],in);
}
......@@ -116,7 +116,7 @@ namespace dlib
);
// functions from the enumerable interface
inline unsigned long size (
inline size_t size (
) const;
inline bool at_start (
......@@ -142,7 +142,7 @@ namespace dlib
// data members
unsigned long set_size;
size_t set_size;
T* d;
mutable T* cur;
mutable bool at_start_;
......@@ -231,7 +231,7 @@ namespace dlib
set_size = source.size();
for (unsigned long i = 0; source.size() > 0; ++i)
for (size_t i = 0; source.size() > 0; ++i)
source.remove_any(d[i]);
compare comp;
......@@ -261,7 +261,7 @@ namespace dlib
set_size = source.size();
for (unsigned long i = 0; source.size() > 0; ++i)
for (size_t i = 0; source.size() > 0; ++i)
source.remove_any(d[i]);
}
else
......@@ -282,10 +282,10 @@ namespace dlib
const T& item
) const
{
unsigned long high = set_size;
unsigned long low = 0;
unsigned long p = set_size;
unsigned long idx;
size_t high = set_size;
size_t low = 0;
size_t p = set_size;
size_t idx;
while (p > 0)
{
p = (high-low)>>1;
......@@ -306,7 +306,7 @@ namespace dlib
typename T,
typename compare
>
unsigned long static_set_kernel_1<T,compare>::
size_t static_set_kernel_1<T,compare>::
size (
) const
{
......@@ -421,7 +421,7 @@ namespace dlib
else if (cur != 0)
{
++cur;
if (static_cast<unsigned long>(cur - d) < set_size)
if (static_cast<size_t>(cur - d) < set_size)
{
return true;
}
......
dlib/statistics/random_subset_selector.h
View file @ cf5e25a9
......@@ -67,7 +67,7 @@ namespace dlib
const std::vector<T>& to_std_vector(
) const { return items; }
unsigned long size (
size_t size (
) const
{
return items.size();
......
dlib/statistics/random_subset_selector_abstract.h
View file @ cf5e25a9
......@@ -101,7 +101,7 @@ namespace dlib
- #size() == 0
!*/
unsigned long size (
size_t size (
) const;
/*!
ensures
......
dlib/svm/kernel_matrix.h
View file @ cf5e25a9
......@@ -65,7 +65,7 @@ namespace dlib
}
template <typename kernel_type>
inline unsigned long size (
inline size_t size (
const typename kernel_type::sample_type&
)
{
......
dlib/svm/linearly_independent_subset_finder.h
View file @ cf5e25a9
......@@ -296,7 +296,7 @@ namespace dlib
temp.swap(item.temp);
}
unsigned long size (
size_t size (
) const { return dictionary.size(); }
const matrix<sample_type,0,1,mem_manager_type> get_dictionary (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment