summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-23 00:23:09 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-23 00:23:09 +0000
commit628b834bba430077e9fc9848c69cabe4be1a5da5 (patch)
tree3b48b265c18fdfd88adc4d2de701324eb01b1e3d /TAO
parentd684ef92335832c81aecf9191cb91766dc2ff115 (diff)
downloadATCD-628b834bba430077e9fc9848c69cabe4be1a5da5.tar.gz
ChangeLogTag:Tue Sep 22 19:18:36 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog-98c13
-rw-r--r--TAO/examples/Simple/bank/Client_i.cpp2
-rw-r--r--TAO/examples/Simple/bank/Server_i.cpp1
-rw-r--r--TAO/utils/IOR-parser/ior-handler.cpp5
4 files changed, 15 insertions, 6 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 8e8a41458bc..192579bf1bb 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,16 @@
+Tue Sep 22 19:18:36 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * utils/IOR-parser/ior-handler.cpp:
+ Fixed out-of-bounds error in an array.
+ the IorHander::hexChar2int() function was not returning a value
+ on every execution path.
+
+ * examples/Simple/bank/Server_i.cpp:
+ Removed unreached statement.
+
+ * examples/Simple/bank/Client_i.cpp:
+ Removed unused variable.
+
Tue Sep 22 18:19:42 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
* tao/IIOP_Object.cpp:
diff --git a/TAO/examples/Simple/bank/Client_i.cpp b/TAO/examples/Simple/bank/Client_i.cpp
index 7add8b64c14..444072be1de 100644
--- a/TAO/examples/Simple/bank/Client_i.cpp
+++ b/TAO/examples/Simple/bank/Client_i.cpp
@@ -255,8 +255,6 @@ Client_i::check_accounts (void)
int
Client_i::run (void)
{
- u_int i;
-
this->check_accounts ();
TAO_TRY
diff --git a/TAO/examples/Simple/bank/Server_i.cpp b/TAO/examples/Simple/bank/Server_i.cpp
index 74752f93664..b290e4eab98 100644
--- a/TAO/examples/Simple/bank/Server_i.cpp
+++ b/TAO/examples/Simple/bank/Server_i.cpp
@@ -53,7 +53,6 @@ Server_i::parse_args (void)
"\n",
argv_ [0]),
1);
- break;
}
// Indicates successful parsing of command line.
diff --git a/TAO/utils/IOR-parser/ior-handler.cpp b/TAO/utils/IOR-parser/ior-handler.cpp
index d8e1bf7bd28..dc6b1262c2c 100644
--- a/TAO/utils/IOR-parser/ior-handler.cpp
+++ b/TAO/utils/IOR-parser/ior-handler.cpp
@@ -28,6 +28,7 @@ IorHandler::hexChar2int (char thisChar)
case 'e': return (14);
case 'f': return (15);
}
+ return -1;
}
u_long
@@ -121,7 +122,7 @@ IorHandler::skipSpaceIfAny(char *readPtr, int *hexCharsRead)
void
IorHandler::skipNullOctets (char *readPtr, int *hexCharsRead, int expectingStr)
{
- char nullOctet[2];
+ char nullOctet[4];
int offset;
*hexCharsRead = 0;
@@ -163,9 +164,7 @@ int
IorHandler::findIfVisiIor(char *readPtr, int *hexCharsRead)
{
char nullOctet[2];
- char visiPreamble[6];
int offset;
- int visiPreambleLen = 5;
int hasVisiPreamble = 0;
*hexCharsRead = 0;