aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.txt2
-rw-r--r--buffers.c11
-rw-r--r--main.c2
-rw-r--r--mkrelease.sh14
4 files changed, 20 insertions, 9 deletions
diff --git a/README.txt b/README.txt
index ff0f613..83e1c94 100644
--- a/README.txt
+++ b/README.txt
@@ -22,6 +22,8 @@ Thomas Dettbarn, 30-Dec-2010
color themes were fixed
0.67: a "base address" functionality was added, which makes it easier to work
with memory dumps.
+0.68: slight bug fix as suggested by christoph: under some circumstances, the
+ opening of a file could segfault.
---------------------------------------------------------[ 1. Getting started ]-
diff --git a/buffers.c b/buffers.c
index 5f196ea..f19d885 100644
--- a/buffers.c
+++ b/buffers.c
@@ -13,11 +13,20 @@
//
tUInt32 openbuf(tBuffer* hBuf,tUInt8 bufnum,char* filename)
{
+ unsigned int filenamelen=0;
+ if (filename == NULL)
+ return RETNOK;
+
+ filenamelen=strlen(filename);
+ if (filenamelen>510)
+ filenamelen=510;
+
hBuf->changesnum=0;
hBuf->valid=0;
hBuf->fresh=1;
hBuf->file=fopen(filename,"rb");
- memcpy(hBuf->filename,filename,512);
+ memcpy(hBuf->filename,filename,filenamelen+1);
+
hBuf->filename[511]=0;
if (hBuf->file)
{
diff --git a/main.c b/main.c
index cb2964e..e6f014c 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
#define MAJORVERSION 0
#define MINORVERSION 6
-#define REVISION 7
+#define REVISION 8
#include <stdio.h>
#include <stdlib.h>
#include <strings.h>
diff --git a/mkrelease.sh b/mkrelease.sh
index d6fc4bc..d751b67 100644
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -1,4 +1,4 @@
-mkdir dhex_0.67
+mkdir dhex_0.68
for I in `echo "
Makefile
buffers.c
@@ -37,11 +37,11 @@ dhex_markers.5
dhex_searchlog.5
mkrelease.sh" | sort -f`
do
- cp $I dhex_0.67/
+ cp $I dhex_0.68/
done
-( cd dhex_0.67/ && make && ./dhex -v && make clean && cd .. && \
-tar cvfz dhex_0.67.tar.gz dhex_0.67 )
-cp dhex_0.67.tar.gz dhex_latest.tar.gz
-md5 dhex_0.67.tar.gz
-md5 dhex_latest.tar.gz
+( cd dhex_0.68/ && make && ./dhex -v && make clean && cd .. && \
+tar cvfz dhex_0.68.tar.gz dhex_0.68 )
+cp dhex_0.68.tar.gz dhex_latest.tar.gz
+md5sum dhex_0.68.tar.gz
+md5sum dhex_latest.tar.gz
n> 2016-01-18Release 0+git20151202.3864e0a-1debian/0+git20151202.3864e0a-1Jonathan McCrohan1-2/+3 2016-01-18Imported Upstream version 0+git20151202.3864e0aJonathan McCrohan840-4057/+18230 2016-01-18Update get-vcs-snapshot.sh to reflect gbp changesJonathan McCrohan2-1/+2 2016-01-18Imported Upstream version 0+git20151202.3864e0aupstream/0+git20151202.3864e0aJonathan McCrohan840-4057/+18230 2015-05-05d/control: various fixes found by libconfig-model-dpkg-perlJonathan McCrohan2-5/+13 2015-04-01Release 0+git20150208.f2053b3-1Jonathan McCrohan1-2/+2 2015-04-01Describe changes made in snapshotJonathan McCrohan1-0/+3 2015-04-01New Upstream Snapshot (commit f2053b3)Jonathan McCrohan1-0/+6 2015-04-01Imported Upstream version 0+git20150208.f2053b3upstream/0+git20150208.f2053b3Jonathan McCrohan32-333/+483 2014-12-28Release 0+git20141218.b46a22c-1debian/0+git20141218.b46a22c-1Jonathan McCrohan1-2/+2 2014-12-28Updated AU DVB-T files; Thanks Brian Burch! (Closes LP: #1393280)Jonathan McCrohan1-0/+1 2014-12-28New Upstream Snapshot (commit b46a22c)Jonathan McCrohan1-0/+6 2014-12-28Imported Upstream version 0+git20141218.b46a22cupstream/0+git20141218.b46a22cJonathan McCrohan535-639/+317 2014-10-20Release 0+git20141009.d26b627-1debian/0+git20141009.d26b627-1Jonathan McCrohan1-2/+2 2014-10-20Fix up packaging to account for move to DVBv5Jonathan McCrohan2-2/+6 2014-10-20delete d/dtv-scan-files.install; Upstream now supplies a MakefileJonathan McCrohan2-4/+1 2014-10-15d/control: update Standards Version to 3.9.6Jonathan McCrohan2-1/+3 2014-10-15d/control: add Build-Depends on dvb-toolsJonathan McCrohan2-1/+2 2014-10-15New Upstream Snapshot (commit d26b627)Jonathan McCrohan1-0/+10 2014-10-15Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627Jonathan McCrohan2010-11120/+159271 2014-07-23Release 0+git20140611.14bd6c7-1debian/0+git20140611.14bd6c7-1Jonathan McCrohan1-2/+2 2014-07-23New Upstream Snapshot (commit 14bd6c7)Jonathan McCrohan1-2/+3 2014-07-23Imported Upstream version 0+git20140611.14bd6c7upstream/0+git20140611.14bd6c7Jonathan McCrohan7-11/+60 2014-05-13New Upstream Snapshot (commit 1246b27)Jonathan McCrohan1-0/+6 2014-05-13Imported Upstream version 0+git20140512.1246b27upstream/0+git20140512.1246b27Jonathan McCrohan391-301/+3983 2014-04-05Release 0+git20140326.cfc2975-1debian/0+git20140326.cfc2975-1Jonathan McCrohan1-2/+2 2014-04-05d/control: update Homepage (upstream has moved from Gitweb to cgit)Jonathan McCrohan2-1/+2 2014-04-05New Upstream Snapshot (commit cfc2975)Jonathan McCrohan1-0/+6 2014-04-05Imported Upstream version 0+git20140326.cfc2975upstream/0+git20140326.cfc2975Jonathan McCrohan118-656/+877 2014-01-16Release 0+git20140107.1850cf8-1debian/0+git20140107.1850cf8-1Jonathan McCrohan1-2/+2 2014-01-16Update Standards Version to 3.9.5Jonathan McCrohan2-1/+9 No changes required