rxvt-unicode/src/rxvtutil.h

#ifndef RXVT_UTIL_H
#define RXVT_UTIL_H

#include <stdlib.h>
#include <string.h>
#include "ecb.h"
#include "estl.h"

// increases code size unless -fno-enforce-eh-specs
#if __GNUC__
# define NOTHROW
# define THROW(x)
#else
# define NOTHROW  throw()
# define THROW(x) throw x
#endif

// various utility functions
template<typename T, typename U> static inline void min_it (T &a, U b) {    a = a < (T)b ? a : (T)b; }
template<typename T, typename U> static inline void max_it (T &a, U b) {    a = a > (T)b ? a : (T)b; }

template<typename T, typename U, typename V> static inline T    clamp    (T  v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; }
template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) {    v = v < (T)a ? a : v >(T)b ? b : v; }

template<typename T> static inline T squared_diff (T a, T b) { return (a-b)*(a-b); }

// linear interpolation
template<typename T, typename U, typename P>
static inline
T lerp (T a, U b, P p)
{
  return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
}

// return a very temporary (and never deallocated) buffer. keep small.
void *rxvt_temp_buf (int len);

template<typename T>
static inline T *
rxvt_temp_buf (int len)
{
  return (T *)rxvt_temp_buf (len * sizeof (T));
}

// in range including end
#define IN_RANGE_INC(val,beg,end) \
  ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))

// in range excluding end
#define IN_RANGE_EXC(val,beg,end) \
  ((unsigned int)(val) - (unsigned int)(beg) <  (unsigned int)(end) - (unsigned int)(beg))

// for m >= -n, ensure remainder lies between 0..n-1
#define MOD(m,n) (((m) + (n)) % (n))

// makes dynamically allocated objects zero-initialised
struct zero_initialized
{
  void *operator new (size_t s);
  void operator delete (void *p, size_t s);
};

struct stringvec : simplevec<char *>
{
  ~stringvec ()
  {
    for (char **c = begin (); c != end (); c++)
      free (*c);
  }
};

#if 0
template<typename T>
struct rxvt_vec : simplevec<void *>
{
  typedef T *iterator;

  void push_back (T d) { simplevec<void *>::push_back ((void *)d); }
  T pop_back () { return (T*)simplevec<void *>::pop_back (); }
  void erase (int i) { erase (begin () + i); }
  void erase (iterator i) { simplevec<void *>::erase ((void **)i); }
  iterator begin () const { return (iterator)simplevec<void *>::begin (); }
  iterator end () const { return (iterator)simplevec<void *>::end (); }
  T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); }
  const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); }
};
#endif

template<typename T>
struct auto_ptr
{
  T *p;

  auto_ptr () : p (0) { }
  auto_ptr (T *a) : p (a) { }

  auto_ptr (auto_ptr<T> &a)
  {
    p = a.p;
    a.p = 0;
  }

  template<typename A>
  auto_ptr (auto_ptr<A> &a)
  {
    p = a.p;
    a.p = 0;
  }

  ~auto_ptr ()
  {
    free (p);
  }

  // void because it makes sense in our context
  void operator = (T *a)
  {
    free (p);
    p = a;
  }

  void operator = (auto_ptr &a)
  {
    *this = a.p;
    a.p = 0;
  }

  template<typename A>
  void operator = (auto_ptr<A> &a)
  {
    *this = a.p;
    a.p = 0;
  }

  operator T * () const { return p; }

  T *operator -> () const { return p; }
  T &operator * () const { return *p; }

  T *get ()
  {
    T *r = p;
    p = 0;
    return r;
  }
};

typedef auto_ptr<char> auto_str;

#endif

Revision:	1.50
Committed:	Mon Jan 23 14:29:24 2012 UTC (12 years, 4 months ago) by sf-exg
Content type:	text/plain
Branch:	MAIN
Changes since 1.49:	+2 -2 lines
Log Message:	Fix undefined behaviour in auto_str usage. The operand of 'delete' cannot be a pointer to an array object. Fix the bug by using malloc/free rather than new/delete.
#	Content
1	#ifndef RXVT_UTIL_H
2	#define RXVT_UTIL_H
3
4	#include <stdlib.h>
5	#include <string.h>
6	#include "ecb.h"
7	#include "estl.h"
8
9	// increases code size unless -fno-enforce-eh-specs
10	#if __GNUC__
11	# define NOTHROW
12	# define THROW(x)
13	#else
14	# define NOTHROW throw()
15	# define THROW(x) throw x
16	#endif
17
18	// various utility functions
19	template<typename T, typename U> static inline void min_it (T &a, U b) { a = a < (T)b ? a : (T)b; }
20	template<typename T, typename U> static inline void max_it (T &a, U b) { a = a > (T)b ? a : (T)b; }
21
22	template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; }
23	template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = v < (T)a ? a : v >(T)b ? b : v; }
24
25	template<typename T> static inline T squared_diff (T a, T b) { return (a-b)*(a-b); }
26
27	// linear interpolation
28	template<typename T, typename U, typename P>
29	static inline
30	T lerp (T a, U b, P p)
31	{
32	return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
33	}
34
35	// return a very temporary (and never deallocated) buffer. keep small.
36	void *rxvt_temp_buf (int len);
37
38	template<typename T>
39	static inline T *
40	rxvt_temp_buf (int len)
41	{
42	return (T )rxvt_temp_buf (len sizeof (T));
43	}
44
45	// in range including end
46	#define IN_RANGE_INC(val,beg,end) \
47	((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))
48
49	// in range excluding end
50	#define IN_RANGE_EXC(val,beg,end) \
51	((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
52
53	// for m >= -n, ensure remainder lies between 0..n-1
54	#define MOD(m,n) (((m) + (n)) % (n))
55
56	// makes dynamically allocated objects zero-initialised
57	struct zero_initialized
58	{
59	void *operator new (size_t s);
60	void operator delete (void *p, size_t s);
61	};
62
63	struct stringvec : simplevec<char *>
64	{
65	~stringvec ()
66	{
67	for (char **c = begin (); c != end (); c++)
68	free (*c);
69	}
70	};
71
72	#if 0
73	template<typename T>
74	struct rxvt_vec : simplevec<void *>
75	{
76	typedef T *iterator;
77
78	void push_back (T d) { simplevec<void >::push_back ((void )d); }
79	T pop_back () { return (T)simplevec<void >::pop_back (); }
80	void erase (int i) { erase (begin () + i); }
81	void erase (iterator i) { simplevec<void >::erase ((void *)i); }
82	iterator begin () const { return (iterator)simplevec<void *>::begin (); }
83	iterator end () const { return (iterator)simplevec<void *>::end (); }
84	T &operator [] (int i) { return * (T ) (& (( (simplevec<void > )this)[i])); }
85	const T &operator [] (int i) const { return * (const T ) (& (( (const simplevec<void > )this)[i])); }
86	};
87	#endif
88
89	template<typename T>
90	struct auto_ptr
91	{
92	T *p;
93
94	auto_ptr () : p (0) { }
95	auto_ptr (T *a) : p (a) { }
96
97	auto_ptr (auto_ptr<T> &a)
98	{
99	p = a.p;
100	a.p = 0;
101	}
102
103	template<typename A>
104	auto_ptr (auto_ptr<A> &a)
105	{
106	p = a.p;
107	a.p = 0;
108	}
109
110	~auto_ptr ()
111	{
112	free (p);
113	}
114
115	// void because it makes sense in our context
116	void operator = (T *a)
117	{
118	free (p);
119	p = a;
120	}
121
122	void operator = (auto_ptr &a)
123	{
124	*this = a.p;
125	a.p = 0;
126	}
127
128	template<typename A>
129	void operator = (auto_ptr<A> &a)
130	{
131	*this = a.p;
132	a.p = 0;
133	}
134
135	operator T * () const { return p; }
136
137	T *operator -> () const { return p; }
138	T &operator * () const { return *p; }
139
140	T *get ()
141	{
142	T *r = p;
143	p = 0;
144	return r;
145	}
146	};
147
148	typedef auto_ptr<char> auto_str;
149
150	#endif
151