From cdf84987841ad22b9d3f6b7dec24c4e777debca2 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Tue, 1 Jan 2013 17:10:42 +0000
Subject: [PATCH] Revert 378248. I changed the logic of this function
unitentionally, pointed out by file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/translate.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/main/translate.c b/main/translate.c
index ac9112e818..ce430ce977 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -283,12 +283,6 @@ static void *newpvt(struct ast_translator *t, const struct ast_format *explicit_
int len;
char *ofs;
- /* If we don't have a local init routine, don't bother building the
- ast_trans_pvt */
- if (!t->newpvt) {
- return NULL;
- }
-
/*
* compute the required size adding private descriptor,
* buffer, AST_FRIENDLY_OFFSET.
@@ -315,7 +309,7 @@ static void *newpvt(struct ast_translator *t, const struct ast_format *explicit_
ast_format_copy(&pvt->explicit_dst, explicit_dst);
}
/* call local init routine, if present */
- if (t->newpvt(pvt)) {
+ if (t->newpvt && t->newpvt(pvt)) {
ast_free(pvt);
return NULL;
}
--
GitLab