projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix various bugs in DDF/JSON bridge
[mech_eap.orig]
/
util_attr.cpp
diff --git
a/util_attr.cpp
b/util_attr.cpp
index
4da585d
..
6771a76
100644
(file)
--- a/
util_attr.cpp
+++ b/
util_attr.cpp
@@
-636,7
+636,7
@@
gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const
JSONObject obj = jsonRepresentation();
#if 0
JSONObject obj = jsonRepresentation();
#if 0
- obj.dump(stdout
, JSON_INDENT(3)
);
+ obj.dump(stdout);
#endif
s = obj.dump(JSON_COMPACT);
#endif
s = obj.dump(JSON_COMPACT);
@@
-679,8
+679,6
@@
gss_eap_attr_ctx::mapException(OM_uint32 *minor, std::exception &e) const
OM_uint32 major;
/* Errors we handle ourselves */
OM_uint32 major;
/* Errors we handle ourselves */
- major = GSS_S_FAILURE;
-
if (typeid(e) == typeid(std::bad_alloc)) {
*minor = ENOMEM;
goto cleanup;
if (typeid(e) == typeid(std::bad_alloc)) {
*minor = ENOMEM;
goto cleanup;
@@
-688,6
+686,9
@@
gss_eap_attr_ctx::mapException(OM_uint32 *minor, std::exception &e) const
major = GSS_S_BAD_NAME;
*minor = GSSEAP_BAD_ATTR_TOKEN;
goto cleanup;
major = GSS_S_BAD_NAME;
*minor = GSSEAP_BAD_ATTR_TOKEN;
goto cleanup;
+ } else if (this == NULL) {
+ major = GSS_S_FAILURE;
+ goto cleanup;
}
/* Errors we delegate to providers */
}
/* Errors we delegate to providers */